When multi-line dependencies occur, use a "DEPENDS+= package" format

for each of the continuation lines, rather than using backslashes to
continue a single, long definition. This makes it much easier to spot
pre-requisite packages and other dependencies.

19 files changed, 77 insertions, 77 deletions

diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 3df1fc888f0..b4b1389302d 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/15 09:26:12 agc Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index d6d61e02854..faa30d940c7 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:13 agc Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi \
-		festogi-spanish-2.0:../festogi-spanish
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festogi-spanish-2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index a1f204bab77..189f889687a 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:13 agc Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index e00c127e749..39a6db3a9a1 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:14 agc Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 5465b56872c..af5634243b1 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/28 04:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/02/15 09:26:14 agc Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-oald-1.4.0:../festlex-oald \
-		mbrola-301h:../mbrola \
-		mbrolavox-en1-980910:../mbrolavox-en1
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	mbrola-301h:../mbrola
+DEPENDS+=	mbrolavox-en1-980910:../mbrolavox-en1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index b94bc58e0c8..070df4c72ba 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:14 agc Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi \
-		festogi-spanish-2.0:../festogi-spanish
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festogi-spanish-2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 82b5807654a..0c08230a826 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:14 agc Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 0c108c8b8ea..47b17b7f0c7 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/28 04:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/15 09:26:15 agc Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-kal8-*
 
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 5636537e2e9..a4320eb887f 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:15 agc Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-kal16-*
 
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index f3a0cb75c45..92afb30f4c8 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/28 04:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/15 09:26:15 agc Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-ked8-*
 
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index cc2f6634ca7..a732a7d98f0 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/12/28 04:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/02/15 09:26:16 agc Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-ked16-*
 
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 6edf875f2fd..a84a4a7d862 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:16 agc Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 1b7d1a3befb..cd13b5db2db 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:16 agc Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 7dfea56ba1e..b7fb052f66c 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/12/28 04:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2000/02/15 09:26:17 agc Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
 
 CONFLICTS=	festvox-rab16-*
 
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index e811fc86892..9eb9c125c72 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 09:26:17 agc Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@@ -9,8 +9,8 @@ MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index b356f35a770..2eb30aa8778 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/15 09:26:17 agc Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu \
-		mbrola-301h:../mbrola \
-		mbrolavox-us1-980512:../mbrolavox-us1
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	mbrola-301h:../mbrola
+DEPENDS+=	mbrolavox-us1-980512:../mbrolavox-us1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 56ff3135dcb..5a2dfadc5d7 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/15 09:26:18 agc Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu \
-		mbrola-301h:../mbrola \
-		mbrolavox-us2-980812:../mbrolavox-us2
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	mbrola-301h:../mbrola
+DEPENDS+=	mbrolavox-us2-980812:../mbrolavox-us2
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 9d0a6dfff0e..5ad2cf7ee2e 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/15 09:26:18 agc Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	festival-1.4.0:../festival \
-		festlex-poslex-1.4.0:../festlex-poslex \
-		festlex-cmu-1.4.0:../festlex-cmu \
-		mbrola-301h:../mbrola \
-		mbrolavox-us3-990208:../mbrolavox-us3
+DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	mbrola-301h:../mbrola
+DEPENDS+=	mbrolavox-us3-990208:../mbrolavox-us3
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index ea52dd9a81c..884c8690bd0 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/07/08 07:35:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/15 09:26:18 agc Exp $
 #
 
 DISTNAME=	xsidplay-1_3_8
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	_tar.gz
 MAINTAINER=	pooka@iki.fi
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
 
-DEPENDS=	sidplay-1.36.35:../../audio/sidplay \
-		qt-1.44:../../x11/qt
+DEPENDS=	sidplay-1.36.35:../../audio/sidplay
+DEPENDS+=	qt-1.44:../../x11/qt
 
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes