summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/SDL_mixer/buildlink3.mk5
-rw-r--r--audio/SDL_sound/buildlink3.mk5
-rw-r--r--audio/arts/buildlink3.mk5
-rw-r--r--audio/esound/buildlink3.mk5
-rw-r--r--audio/flac/buildlink3.mk5
-rw-r--r--audio/gnome-speech/buildlink3.mk5
-rw-r--r--audio/id3lib/buildlink3.mk5
-rw-r--r--audio/libcddb/buildlink3.mk5
-rw-r--r--audio/libid3tag/buildlink3.mk5
-rw-r--r--audio/libmikmod/buildlink3.mk5
-rw-r--r--audio/libsamplerate/buildlink3.mk5
-rw-r--r--audio/libshout/buildlink3.mk5
-rw-r--r--audio/libvorbis/buildlink3.mk5
-rw-r--r--audio/musicbrainz/buildlink3.mk5
-rw-r--r--audio/py-ogg/buildlink3.mk5
-rw-r--r--audio/rplay/buildlink3.mk5
-rw-r--r--audio/speex/buildlink3.mk5
-rw-r--r--audio/sweep/buildlink3.mk5
-rw-r--r--audio/wsoundserver/buildlink3.mk5
-rw-r--r--audio/xfce4-mixer/buildlink3.mk5
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk5
-rw-r--r--audio/xmms-meta-input/buildlink3.mk5
-rw-r--r--audio/xmms/buildlink3.mk5
23 files changed, 46 insertions, 69 deletions
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index b18af6d5313..6b7920d0c0b 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
@@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= SDL_mixer
BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
+.endif # SDL_MIXER_BUILDLINK3_MK
.include "../../devel/SDL/buildlink3.mk"
-.endif # SDL_MIXER_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index ababb099b28..a625fc85355 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 06:58:39 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= SDL_sound
.if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
+.endif # SDL_SOUND_BUILDLINK3_MK
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/smpeg/buildlink3.mk"
-.endif # SDL_SOUND_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 3f059f61836..c814e5f8dc1 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= arts
.if !empty(ARTS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
+.endif # ARTS_BUILDLINK3_MK
.include "../../audio/esound/buildlink3.mk"
.include "../../audio/libaudiofile/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
-.endif # ARTS_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index 98e87b91a9d..808b0be08ba 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= esound
.if !empty(ESOUND_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.esound+= esound>=0.2.18
BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
+.endif # ESOUND_BUILDLINK3_MK
.include "../../audio/libaudiofile/buildlink3.mk"
-.endif # ESOUND_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index fefacf24551..762d2e2c9a1 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= flac
.if !empty(FLAC_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1
BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
+.endif # FLAC_BUILDLINK3_MK
.include "../../audio/libogg/buildlink3.mk"
-.endif # FLAC_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index 125b95fe0d8..bbf69e17fa1 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gnome-speech
.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.2.7
BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
+.endif # GNOME_SPEECH_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.endif # GNOME_SPEECH_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 9de98ef63d1..337eb2d0b0d 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= id3lib
.if !empty(ID3LIB_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3
BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
+.endif # ID3LIB_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
-.endif # ID3LIB_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index 4f63722908c..80c2d447713 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libcddb
.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4
BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
+.endif # LIBCDDB_BUILDLINK3_MK
.include "../../misc/libcdio/buildlink3.mk"
-.endif # LIBCDDB_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index ac0d30632d5..2e903e0cb97 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libid3tag
.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b
BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
+.endif # LIBID3TAG_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
-.endif # LIBID3TAG_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 68fd31fb511..24cba5871c5 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
@@ -15,11 +15,10 @@ BUILDLINK_PACKAGES+= libmikmod
.if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libmikmod+= libmikmod>=3.1.9
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
+.endif # LIBMIKMOD_BUILDLINK3_MK
.if defined(USE_ESOUND) && !empty(USE_ESOUND:M[Yy][Ee][Ss])
. include "../../audio/esound/buildlink3.mk"
.endif
-.endif # LIBMIKMOD_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index cede6cf55e4..e91ed2ba4f3 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libsamplerate
.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
+.endif # LIBSAMPLERATE_BUILDLINK3_MK
.include "../../audio/libsndfile/buildlink3.mk"
-.endif # LIBSAMPLERATE_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index bb0e7293c3e..1fd4d51c3aa 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libshout
.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libshout+= libshout>=2.0
BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
+.endif # LIBSHOUT_BUILDLINK3_MK
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.endif # LIBSHOUT_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index ae8f1f0110a..b5b345c03ef 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libvorbis
.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1
BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
+.endif # LIBVORBIS_BUILDLINK3_MK
.include "../../audio/libogg/buildlink3.mk"
-.endif # LIBVORBIS_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 32960ab1666..87fe870929d 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= musicbrainz
.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.musicbrainz+= musicbrainz>=2.0.2
BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz
+.endif # MUSICBRAINZ_BUILDLINK3_MK
.include "../../textproc/expat/buildlink3.mk"
-.endif # MUSICBRAINZ_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index 2e4cf004c25..e92e95c4747 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
@@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+= pyogg
BUILDLINK_PKGBASE.pyogg?= ${PYPKGPREFIX}-ogg
BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
+.endif # PY_OGG_BUILDLINK3_MK
.include "../../audio/libogg/buildlink3.mk"
-.endif # PY_OGG_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index 7266eda4026..487283b645c 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= rplay
.if !empty(RPLAY_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.rplay+= rplay>=3.3.2nb1
BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
+.endif # RPLAY_BUILDLINK3_MK
.include "../../audio/gsm/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/rx/buildlink3.mk"
-.endif # RPLAY_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 06af32cd1bf..0e8597f5ed1 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= speex
.if !empty(SPEEX_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1
BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
+.endif # SPEEX_BUILDLINK3_MK
.include "../../audio/libogg/buildlink3.mk"
-.endif # SPEEX_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index 00c65f54464..8d784c58692 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= sweep
.if !empty(SWEEP_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.sweep+= sweep>=0.8.2nb6
BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
+.endif # SWEEP_BUILDLINK3_MK
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
@@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.endif # SWEEP_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index b2e76eaad54..64a80d9fcae 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 03:41:45 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WSOUNDSERVER_BUILDLINK3_MK:= ${WSOUNDSERVER_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= wsoundserver
.if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4
BUILDLINK_PKGSRCDIR.wsoundserver?= ../../audio/wsoundserver
+.endif # WSOUNDSERVER_BUILDLINK3_MK
.include "../../audio/libaudiofile/buildlink3.mk"
.include "../../devel/libdockapp/buildlink3.mk"
.include "../../devel/libproplist/buildlink3.mk"
.include "../../wm/windowmaker/buildlink3.mk"
-.endif # WSOUNDSERVER_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 752135ff61e..0341a84bac6 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-mixer
.if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.0.4nb1
BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
+.endif # XFCE4_MIXER_BUILDLINK3_MK
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_MIXER_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index f7c53657df8..d9f0b923c1c 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-xmms-plugin
.if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.1.1nb4
BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
+.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
.include "../../audio/xmms/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index 5affb30e179..310b563f532 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 02:55:49 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMMS_META_INPUT_BUILDLINK3_MK:= ${XMMS_META_INPUT_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= xmms-meta-input
.if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4
BUILDLINK_PKGSRCDIR.xmms-meta-input?= ../../audio/xmms-meta-input
+.endif # XMMS_META_INPUT_BUILDLINK3_MK
.include "../../audio/xmms/buildlink3.mk"
-.endif # XMMS_META_INPUT_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index d966c7626a4..e9184b9bf5b 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= xmms
.if !empty(XMMS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10
BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
+.endif # XMMS_BUILDLINK3_MK
PTHREAD_OPTS+= require
@@ -25,6 +26,4 @@ PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
-.endif # XMMS_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}