Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.

5 files changed, 30 insertions, 45 deletions

diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index c2d217ddede..45812e57978 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
 
-.if !empty(SDL_MIXER_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.SDL_mixer?=	SDL_mixer>=1.2.5nb1
-BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
-.endif	# SDL_MIXER_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	SDL_mixer
 .endif
 
-.if !empty(SDL_MIXER_BUILDLINK3_MK:M\+)
+.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		SDL_mixer
+BUILDLINK_DEPENDS.SDL_mixer?=	SDL_mixer>=1.2.5nb1
+BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 
 .  include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index 0b981268b0e..8375d43acd5 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
 
-.if !empty(ESOUND_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
-BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
-.endif	# ESOUND_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	esound
 .endif
 
-.if !empty(ESOUND_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	esound
+.if !empty(ESOUND_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		esound
+BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
+BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 
 .  include "../../audio/libaudiofile/buildlink3.mk"
 .endif	# ESOUND_BUILDLINK3_MK
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index d7cb8d0b478..0bb38bd6ba3 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
 
-.if !empty(AUDIOFILE_BUILDLINK3_MK:M\+) 
-BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
-BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
-.endif	# AUDIOFILE_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+) 
+.if !empty(BUILDLINK_DEPTH:M+) 
 BUILDLINK_DEPENDS+=	audiofile
 .endif
 
-.if !empty(AUDIOFILE_BUILDLINK3_MK:M\+) 
-BUILDLINK_PACKAGES+=	audiofile
+.if !empty(AUDIOFILE_BUILDLINK3_MK:M+) 
+BUILDLINK_PACKAGES+=		audiofile
+BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
+BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk
index ae252c23631..afa11d38d31 100644
--- a/audio/libogg/buildlink3.mk
+++ b/audio/libogg/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOGG_BUILDLINK3_MK:=	${LIBOGG_BUILDLINK3_MK}+
 
-.if !empty(LIBOGG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
-BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
-.endif	# LIBOGG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libogg
 .endif
 
-.if !empty(LIBOGG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	libogg
+.if !empty(LIBOGG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libogg
+BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
+BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
 .endif	# LIBOGG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk
index 9e00efe8f92..5043d28317c 100644
--- a/audio/oss/buildlink3.mk
+++ b/audio/oss/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OSS_BUILDLINK3_MK:=	${OSS_BUILDLINK3_MK}+
 
-.if !empty(OSS_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.oss?=		oss-[0-9]*
-BUILDLINK_PKGSRCDIR.oss?=	../../audio/oss
-.endif	# OSS_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	oss
 .endif
 
-.if !empty(OSS_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	oss
-BUILDLINK_INCDIRS.oss=	include lib/oss/include
+.if !empty(OSS_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		oss
+BUILDLINK_DEPENDS.oss?=		oss-[0-9]*
+BUILDLINK_PKGSRCDIR.oss?=	../../audio/oss
+BUILDLINK_INCDIRS.oss=		include lib/oss/include
 
 # If we are using audio/oss, then we don't need the NetBSD OSS
 # compatibility library.