MASTER_SITES cleanup.

- Replace ${MASTER_SITE_FOO} with FOO. - Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9% of the time.) - Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and no hint of what it should be was present. - Fix some logic. - And generally, make things more simple and easy to understand. While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and SAMBA macros. Also, replace some EXTRACT_SUFX occurences with USES=tar:*. Checked by: make fetch-urlall-list With hat: portmgr Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
commit: 60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree: 627649ff7699a289d5d78c11bf8d105881402ca8 /math
parent: a50428b01c275f058b067787701d333a9d45cbcb (diff)
download: ports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz
ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip
50 files changed, 48 insertions, 92 deletions
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index a44b18e4afd6..ad9a40cd1f1c 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	SuppDists
 DISTVERSION=	1.1-9.1
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_CRAN} \
+MASTER_SITES=	CRAN \
 		http://r.research.att.com/benchmarks/:benchmark \
 		LOCAL/bf:benchmark
 DISTFILES=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \
diff --git a/math/R/Makefile b/math/R/Makefile
index db6a77040c8b..011d299e801d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -22,8 +22,7 @@ MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${PORTVERSION}
 
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	bf
+PATCH_SITES=		LOCAL/bf
 PATCHFILES=		R-patched-20131112-r64207.diff.bz2
 
 MAINTAINER=	bf@FreeBSD.org
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 4209856d976a..fe0005840825 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	apc
 PORTVERSION=	1.0
 PORTREVISION=	8
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=	LOCAL/arved
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xforms based Auto Payment Calculator
diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index 2bea62db5b72..299d81079023 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	aspcud
 PORTVERSION=	1.9.0
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	math ports-mgmt sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Advanced solver for package dependencies
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index f09186aecd8a..f4ef9dbbdbcf 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	blacs
 PORTVERSION=	1.7
 PORTREVISION=	24
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=blacs
+MASTER_SITES=	NETLIB/blacs
 DISTNAME=	BLACS
 DISTFILES=	mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
 DIST_SUBDIR=	blacs
diff --git a/math/carve/Makefile b/math/carve/Makefile
index 94602647c543..a745c3313ff2 100644
--- a/math/carve/Makefile
+++ b/math/carve/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	carve
 PORTVERSION=	1.4.0
 PORTREVISION=	5
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast, robust constructive solid geometry library
diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index 5db8f8572d94..5448892a824c 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ccmath
 PORTVERSION=	2.2.1
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs
+MASTER_SITES=	SUNSITE/libs
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Mathematics library with many different functions
diff --git a/math/clasp/Makefile b/math/clasp/Makefile
index 6b7953427889..6e108b04cc17 100644
--- a/math/clasp/Makefile
+++ b/math/clasp/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	clasp
 PORTVERSION=	3.1.0
 CATEGORIES=	math devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
 EXTRACT_SUFX=	-source.tar.gz
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/math/clipper/Makefile b/math/clipper/Makefile
index 88ef52e1e6fc..aa829c9033a2 100644
--- a/math/clipper/Makefile
+++ b/math/clipper/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	clipperlib
 PORTVERSION=	6.0.0
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	polyclipping
+MASTER_SITES=	SF/polyclipping
 DISTNAME=	clipper_ver${PORTVERSION}
 
 MAINTAINER=	martin.dieringer@gmx.de
diff --git a/math/foma/Makefile b/math/foma/Makefile
index 2b2f484f6c7d..d2cf4f71bd2b 100644
--- a/math/foma/Makefile
+++ b/math/foma/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	foma
 PORTVERSION=	0.9.17
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Toolkit for constructing finite-state automata and transducers
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 8b3a03ce7c90..bf9054f7aa6a 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	geg
 PORTVERSION=	1.0.2
 PORTREVISION=	8
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE/science/visualization/plotting \
 		http://www.infolaunch.com/~daveb/
-MASTER_SITE_SUBDIR=	science/visualization/plotting
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visualise multiple 2D-functions of one variable
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index 3316115880ad..43abc4249d7f 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gexpr
 PORTVERSION=	2.0.2
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/math/calc
+MASTER_SITES=	SUNSITE/apps/math/calc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shell calculator
diff --git a/math/glm/Makefile b/math/glm/Makefile
index 3eb6b99b25ea..33c742c5aaf8 100644
--- a/math/glm/Makefile
+++ b/math/glm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	glm
 PORTVERSION=	0.9.6.3
 PORTEPOCH=	1
 CATEGORIES=	math graphics
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ogl-math/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/ogl-math/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	C++ mathematics library for software based on the OpenGL GLSL
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 2a857533dbb3..a5a11ee3d251 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	glpk
 PORTVERSION=	4.52.1
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	glpk
+MASTER_SITES=	GNU
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	GNU Linear Programming Kit
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index b03b2af9b3e8..7aa7e3205fd4 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gmp
 PORTVERSION=	5.1.3
 PORTREVISION=	2
 CATEGORIES=	math devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gmp
+MASTER_SITES=	GNU
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Free library for arbitrary precision arithmetic
diff --git a/math/gnubc/Makefile b/math/gnubc/Makefile
index afaf593b8f1c..6d045b4543e1 100644
--- a/math/gnubc/Makefile
+++ b/math/gnubc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bc
 PORTVERSION=	1.06
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	gabor@FreeBSD.org
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index c98d36145710..b789ba7db279 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	gotoblas
 PORTVERSION=	2.${GOTOBLAS2VER}.${LAPACKVER}
 PORTREVISION=	5
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/gotoblas|} \
-		NL:lapack,lapack_tmg
-MASTER_SITE_SUBDIR=	lapack/:lapack lapack/timing/:lapack_tmg
+MASTER_SITES=	LOCAL/maho/gotoblas \
+		NL/lapack:lapack NL/lapack/timing:lapack_tmg
 DISTFILES=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
 		lapack-${LAPACKVER}.tgz:lapack \
 		large.tgz:lapack_tmg timing.tgz:lapack_tmg
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index d283171ced2d..5395da7b398b 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	4.4.0
 DISTVERSIONSUFFIX=	-source
 PORTREVISION=	1
 CATEGORIES=	math devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Grounding algorithm based on semi-naive database evaluation
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 1dee0d1035c7..4ce1ab6b2bd8 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hfst
 PORTVERSION=	3.8.2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/source
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/source
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A toolkit for for processing natural language morphologies
diff --git a/math/jags/Makefile b/math/jags/Makefile
index ab31eb7590fd..1b9d8e51cb8e 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -5,11 +5,10 @@ PORTNAME=	mcmc-jags
 PORTVERSION=	3.4.0
 PORTREVISION=	4
 CATEGORIES=	math
-MASTER_SITES=	SF:1,2,3,4
-MASTER_SITE_SUBDIR=	mcmc-jags/JAGS/${S}.x/Source/:1 \
-		mcmc-jags/Examples/${S}.x/:2 \
-		mcmc-jags/Manuals/2.x/:3 \
-		mcmc-jags/Manuals/${S}.x/:4
+MASTER_SITES=	SF/mcmc-jags/JAGS/${S}.x/Source/:1 \
+		SF/mcmc-jags/Examples/${S}.x/:2 \
+		SF/mcmc-jags/Manuals/2.x/:3 \
+		SF/mcmc-jags/Manuals/${S}.x/:4
 DISTFILES=	JAGS-${PORTVERSION}${EXTRACT_SUFX}:1
 EXTRACT_ONLY=	${DISTFILES:M*[12]:C|:.*||}
 
diff --git a/math/jtransforms/Makefile b/math/jtransforms/Makefile
index 7adc356fc425..26ed4ce46dea 100644
--- a/math/jtransforms/Makefile
+++ b/math/jtransforms/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	jtransforms
 PORTVERSION=	2.4
 CATEGORIES=	math java
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=jtransforms/jtransforms/${PORTVERSION}
-DISTNAME=	jtransforms-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Multithreaded FFT library written in pure Java
diff --git a/math/laspack/Makefile b/math/laspack/Makefile
index 4d6ee3eea909..dc9f7cf26b32 100644
--- a/math/laspack/Makefile
+++ b/math/laspack/Makefile
@@ -4,14 +4,13 @@
 PORTNAME=	laspack
 PORTVERSION=	1.12.2
 CATEGORIES=	math
-MASTER_SITES=	NL
-MASTER_SITE_SUBDIR=	linalg
+MASTER_SITES=	NL/linalg
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Package for solving large sparse systems of linear equations
 
+USES=		tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile
 MAKE_ARGS=	HOME=${STAGEDIR}${PREFIX}
diff --git a/math/ldouble/Makefile b/math/ldouble/Makefile
index 88db7b109048..336b31e6da76 100644
--- a/math/ldouble/Makefile
+++ b/math/ldouble/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	ldouble
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	LOCAL/ahze
 #	http://www.moshier.net/
-MASTER_SITE_SUBDIR=	ahze
 DISTFILES=	${LDOUBLE_DISTFILE}
 
 MAINTAINER=	bf@FreeBSD.org
diff --git a/math/libjbigi/Makefile b/math/libjbigi/Makefile
index 0e49df674f0e..43fc347ec8a6 100644
--- a/math/libjbigi/Makefile
+++ b/math/libjbigi/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	libjbigi
 PORTVERSION=	0.8.7
 CATEGORIES=	math java
 MASTER_SITES=	http://mirror.i2p2.de/ \
-		${MASTER_SITE_GOOGLE_CODE}
+		GOOGLE_CODE
 DISTNAME=	i2psource_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/lrng/Makefile b/math/lrng/Makefile
index 1dc9f08aad9e..bde1024bf23a 100644
--- a/math/lrng/Makefile
+++ b/math/lrng/Makefile
@@ -4,9 +4,9 @@
 PORTNAME=	lrng
 PORTVERSION=	20130314
 CATEGORIES=	math
-MASTER_SITES=	http://www.iro.umontreal.ca/%SUBDIR%/:1,2 \
-	${MASTER_SITE_LOCAL:S|%SUBDIR%/$|bf/${PORTNAME}/${PORTVERSION}/:1,2|}
-MASTER_SITE_SUBDIR=	~simardr/rng/:1 ~lecuyer/myftp/papers/:2
+MASTER_SITES=	http://www.iro.umontreal.ca/~simardr/rng/:1 \
+		http://www.iro.umontreal.ca/~lecuyer/myftp/papers/:2 \
+		LOCAL/bf/${PORTNAME}/${PORTVERSION}/:1,2
 DISTFILES=	ex1.c:1 lfsr258.c:1 lfsr113.c:1 WELL1024a.h:1 WELL19937a.h:1 WELL512a.h:1 \
 		WELL44497a.h:1 WELL19937a.c:1 WELL1024a.c:1 WELL512a.c:1 WELL44497a.c:1 \
 		MRG63k3a.c:1 MRG32k3a.c:1 MRG32k5a.c:1 MRG63k3a.h:1 MRG32k5a.h:1 MRG32k3a.h:1 \
diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index d53e488ce253..6c1a24a33bea 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	5.6
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jase
+		LOCAL/jase
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Multiprecision Integer and Rational Arithmetic C/C++ Library
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index ad5ee4956d72..29aebb835116 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	msieve
 PORTVERSION=	1.51
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	\
-	${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	bf@FreeBSD.org
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index b1f2b72983c2..87c4ca57bf5b 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	6.3.51
 PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www2e.biglobe.ne.jp/~isizaka/bin/ \
-		${MASTER_SITE_PORTS_JP}
+		PORTS_JP
 DISTNAME=	Ngraph-${PORTVERSION}-src
 
 MAINTAINER=	sanpei@FreeBSD.org
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 1d637a7cf4ed..0c2f8d63b621 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	octave
 PORTVERSION=	3.8.2
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	octave
+MASTER_SITES=	GNU
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index d2924e1cec8d..0dc11cf132c5 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	oleo
 PORTVERSION=	1.99.16
 PORTREVISION=	8
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals
diff --git a/math/p5-Algorithm-Munkres/Makefile b/math/p5-Algorithm-Munkres/Makefile
index a944b7434c05..e0c71b122036 100644
--- a/math/p5-Algorithm-Munkres/Makefile
+++ b/math/p5-Algorithm-Munkres/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.08
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Algorithm
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Geo-Coordinates-UTM/Makefile b/math/p5-Geo-Coordinates-UTM/Makefile
index 3224ddedb257..52c83708dc19 100644
--- a/math/p5-Geo-Coordinates-UTM/Makefile
+++ b/math/p5-Geo-Coordinates-UTM/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.11
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Geo
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-Polynomial-Solve/Makefile b/math/p5-Math-Polynomial-Solve/Makefile
index 82412fc79d4b..c145a913f09b 100644
--- a/math/p5-Math-Polynomial-Solve/Makefile
+++ b/math/p5-Math-Polynomial-Solve/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2.70
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Math
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Set-IntSpan-Fast-XS/Makefile b/math/p5-Set-IntSpan-Fast-XS/Makefile
index cf991232b095..f9b04167d503 100644
--- a/math/p5-Set-IntSpan-Fast-XS/Makefile
+++ b/math/p5-Set-IntSpan-Fast-XS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Set
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Basic/Makefile b/math/p5-Statistics-Basic/Makefile
index 38c3fef85ead..703980d65d26 100644
--- a/math/p5-Statistics-Basic/Makefile
+++ b/math/p5-Statistics-Basic/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.6607
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Statistics
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Forecast/Makefile b/math/p5-Statistics-Forecast/Makefile
index 09ccbfe2c744..aa6e385ee09f 100644
--- a/math/p5-Statistics-Forecast/Makefile
+++ b/math/p5-Statistics-Forecast/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.3
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Statistics
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Statistics-LineFit/Makefile b/math/p5-Statistics-LineFit/Makefile
index 4dd634c2db00..e5bd7bb4bc87 100644
--- a/math/p5-Statistics-LineFit/Makefile
+++ b/math/p5-Statistics-LineFit/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Statistics
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Statistics-TTest/Makefile b/math/p5-Statistics-TTest/Makefile
index 011672ed2c22..cd0e39c317fe 100644
--- a/math/p5-Statistics-TTest/Makefile
+++ b/math/p5-Statistics-TTest/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Statistics
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 426ec7476cf1..6ad6c67f8e57 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.02
 PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://gato.sourceforge.net/Download/
-MASTER_SITE_SUBDIR=	gato
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Gato-${PORTVERSION}
 
diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile
index cf00f16d7bda..1af249091418 100644
--- a/math/py-gmpy/Makefile
+++ b/math/py-gmpy/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gmpy
 PORTVERSION=	1.17
 PORTREVISION=	1
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 35c4e3b98908..7b2748ab4f4a 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	theano
 PORTVERSION=	0.7.0
 CATEGORIES=	math python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=source/T/Theano
+MASTER_SITES=	CHEESESHOP/source/T/Theano
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Theano-${DISTVERSION}
 
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index 44b2c6b48493..b3adf6f36395 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	qrupdate
 PORTVERSION=	1.1.2
 PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	qrupdate/qrupdate/1.2
+MASTER_SITES=	SOURCEFORGE/qrupdate/qrupdate/1.2
 
 MAINTAINER=	robertjenssen@ozemail.com.au
 COMMENT=	Fortran library for fast updates of QR and Cholesky decomposition
diff --git a/math/sc/Makefile b/math/sc/Makefile
index f9ad08548ba7..eaf0fa208cb3 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sc
 PORTVERSION=	7.16
 PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/financial/spreadsheet
+MASTER_SITES=	SUNSITE/apps/financial/spreadsheet
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Curses-based spreadsheet program
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 377085b27e93..8bb5c3966d69 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	scalapack
 PORTVERSION=	2.0.2
 PORTREVISION=	6
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
 DIST_SUBDIR=	scalapack
 EXTRACT_ONLY=	scalapack-${PORTVERSION}.tgz manpages.tgz
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 86f896dbdb92..10afe9b06045 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	slatec
 PORTVERSION=	4.1
 PORTREVISION=	4
 CATEGORIES=	math
-MASTER_SITES=	NL:slatec,blas
-MASTER_SITE_SUBDIR=	slatec/:slatec blas/:blas
+MASTER_SITES=	NL/slatec/:slatec NL/blas/:blas
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from Slatec:
 # See Netlib FAQ #2.17: http://netlib.org/misc/faq.html#2.17
 DISTFILES=	guide:slatec slatec_chk.tgz:slatec slatec_src.tgz:slatec \
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index 3429c1d89453..896ef0e9a122 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -6,8 +6,7 @@ PORTREVISION=	7
 CATEGORIES=	math devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v${SLANG_VER}/modules/grace/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${SLANG_VER}/modules/grace/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	garga/slgrace/
+		LOCAL/garga/slgrace
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	SLang module to plot graphs with grace
diff --git a/math/solitaire/Makefile b/math/solitaire/Makefile
index 44a98e918010..c819c7a2d146 100644
--- a/math/solitaire/Makefile
+++ b/math/solitaire/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	solitaire
 PORTVERSION=	19980817
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
+MASTER_SITES=	LOCAL/dd
 DISTFILES=	sol.pl sol-test.txt
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/units/Makefile b/math/units/Makefile
index db29176a8b1b..368b45c969fb 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	units
 PORTVERSION=	2.11
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Unit conversion and calculation
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 8827ec9074e3..cb446e31420b 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	wxMaxima
 PORTVERSION=	14.12.1
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 DISTFILES=	${PORTNAME:tl}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 57f642ca719b..75a9037484a9 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xldlas
 PORTVERSION=	0.85
 PORTREVISION=	8
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/visualization
+MASTER_SITES=	SUNSITE/apps/graphics/visualization
 EXTRACT_SUFX=	-source.tgz
 
 MAINTAINER=	ports@FreeBSD.org
author	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
commit	60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree	627649ff7699a289d5d78c11bf8d105881402ca8 /math
parent	a50428b01c275f058b067787701d333a9d45cbcb (diff)
download	ports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip