23 files changed, 49 insertions, 70 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 6fdb3740fa1d..5b637d4ba012 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -47,6 +47,17 @@ MASTER_SITE_COMP_SOURCES+=	\
 	ftp://ftp.funet.fi/pub/archive/comp.sources.%SUBDIR%/ \
 	ftp://rtfm.mit.edu/pub/usenet/comp.sources.%SUBDIR%/
 
+MASTER_SITE_FESTIVAL= \
+	http://www.speech.cs.cmu.edu/festival/cstr/festival/%SUBDIR%/ \
+	ftp://ftp.leb.net/pub/blinux/festival/mirror.festival_home/%SUBDIR%/ \
+	ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.festival_home/%SUBDIR%/ \
+	ftp://ftp.tuwien.ac.at/opsys/linux/blinux/festival/mirror.festival_home/%SUBDIR%/
+
+MASTER_SITE_FESTIVAL_OGI= \
+	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
+	ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
+	ftp://cslu.cse.ogi.edu/pub/tts/
+
 #
 # FreeBSD mirror sites
 #
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index e61a7ead1e37..1fcd3fb7fef9 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festdoc
 PORTVERSION=	1.4.0.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DIST_SUBDIR=	festival
 
 MAINTAINER=	trevor@FreeBSD.org
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index d96693317917..d90688a65992 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -11,16 +11,11 @@ PORTNAME=	festival
 PORTVERSION=	1.4.1
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/${PORTVERSION}/ \
-		ftp://ftp.leb.net/pub/blinux/${SUB} \
-		ftp://ftp.mayn.de/pub/linux/BLinux/${SUB} \
-		ftp://ftp.tuwien.ac.at/opsys/linux/blinux/${SUB}
-SUB=		festival/mirror.festival_home/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 .if defined (WITH_OGI)
 MASTER_SITES+=	${PATCH_SITES}
-PATCH_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+PATCH_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 .endif
 DISTFILES=	${DISTNAME}.tar.gz \
 		speech_tools-1.2.1.tar.gz
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index d96693317917..d90688a65992 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -11,16 +11,11 @@ PORTNAME=	festival
 PORTVERSION=	1.4.1
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/${PORTVERSION}/ \
-		ftp://ftp.leb.net/pub/blinux/${SUB} \
-		ftp://ftp.mayn.de/pub/linux/BLinux/${SUB} \
-		ftp://ftp.tuwien.ac.at/opsys/linux/blinux/${SUB}
-SUB=		festival/mirror.festival_home/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 .if defined (WITH_OGI)
 MASTER_SITES+=	${PATCH_SITES}
-PATCH_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+PATCH_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 .endif
 DISTFILES=	${DISTNAME}.tar.gz \
 		speech_tools-1.2.1.tar.gz
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 786911bc52a3..2fa36119c0f0 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festlex-cmu
 PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_CMU
 DIST_SUBDIR=	festival
 
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index e7d28193ccfb..656ef3c52b22 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festlex-oald
 PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_OALD
 DIST_SUBDIR=	festival
 
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index c5e5106bed4f..eec0aa528240 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -10,8 +10,7 @@
 PORTNAME=	festlex-ogi
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/ \
-		${MASTER_SITE_NETBSD}
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	OGIlexicon-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 9dc1018cc26f..6bc6efc61e26 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festlex-poslex
 PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_POSLEX
 DIST_SUBDIR=	festival
 
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index ec1210db1abf..1978c8c3c4ce 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -10,7 +10,7 @@
 PORTNAME=	festogi-spanish
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	OGIspanish-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 80743d2de260..5d9846d176be 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -10,7 +10,7 @@
 PORTNAME=	festvox-abc
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_abc_di-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f34211e46780..28eb81df4369 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-don
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_don
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 54981fce2f24..fac7f7984e26 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-el11
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_ellpc11k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index d03f7ee1fb13..28039c952e9c 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -10,9 +10,7 @@
 PORTNAME=	festvox-hvs
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_hvs_di-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 6eec6e200293..9f184cb6ef29 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -10,10 +10,7 @@
 PORTNAME=	festvox-jph
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.leb.net/pub/blinux/${SUB} \
-		ftp://ftp.mayn.de/pub/linux/BLinux/${SUB} \
-		ftp://cslu.cse.ogi.edu/pub/tts/
-SUB=		festival/mirror.ogi-synth_home/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_jph_di-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 5bc5670b9c79..bb6cf40abb75 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-kal16
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kallpc16k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 9c593211222c..86dbc5f841da 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-kal8
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kallpc8k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index b69153cebdc7..17dc784b5c39 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -10,8 +10,8 @@
 PORTNAME=	festvox-ked16
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kedlpc16k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 5d1f8d56b26a..878babefa909 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -10,8 +10,8 @@
 PORTNAME=	festvox-ked8
 PORTVERSION=	1.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kedlpc8k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 08519f610f10..e5777d1d74ff 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -10,9 +10,7 @@
 PORTNAME=	festvox-mwm
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_mwm_di-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 64f309d52144..1bb201db400c 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -10,9 +10,7 @@
 PORTNAME=	festvox-ogirab
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_ogirab_di-2.0
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 6a96186a40bc..7ba40267bd0e 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-rab16
 PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festvox_rablpc16k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index bd84ee5d7943..e269018f2395 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -10,9 +10,8 @@
 PORTNAME=	festvox-rab8
 PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
-		${MASTER_SITE_NETBSD} \
-		ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festvox_rablpc8k
 DIST_SUBDIR=	festival
 
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index ebc1a4d50dcb..e657c33a0be6 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -10,9 +10,7 @@
 PORTNAME=	festvox-tll
 PORTVERSION=	2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.leb.net/pub/blinux/festival/mirror.ogi-synth_home/ \
-		ftp://ftp.mayn.de/pub/linux/BLinux/festival/mirror.ogi-synth_home/ \
-		ftp://cslu.cse.ogi.edu/pub/tts/
+MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_tll_di-2.0
 DIST_SUBDIR=	festival