summaryrefslogtreecommitdiff
path: root/audio/speex
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2004-04-12 23:15:01 +0000
committersalo <salo@pkgsrc.org>2004-04-12 23:15:01 +0000
commit9ba8196a228aa68df9f10e532b9ae58a638f5649 (patch)
treeb94470a6e518254c127339173b2924ffa1f9feab /audio/speex
parent0d382d10b023b5a4fc796af392a3f6f74583c843 (diff)
downloadpkgsrc-9ba8196a228aa68df9f10e532b9ae58a638f5649.tar.gz
Follow libogg into multimedia/.
Diffstat (limited to 'audio/speex')
-rw-r--r--audio/speex/Makefile5
-rw-r--r--audio/speex/buildlink2.mk4
-rw-r--r--audio/speex/buildlink3.mk4
3 files changed, 7 insertions, 6 deletions
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index ff28deb78ca..8eb13661fdb 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/19 01:49:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/12 23:15:01 salo Exp $
#
DISTNAME= speex-1.0.3
@@ -18,6 +18,7 @@ CONFLICTS= Speex-[0-9]*
CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/speex/buildlink2.mk b/audio/speex/buildlink2.mk
index 133f86f5b81..cf26c5d5ae4 100644
--- a/audio/speex/buildlink2.mk
+++ b/audio/speex/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/04/12 23:15:01 salo Exp $
#
# This Makefile fragment is included by packages that use speex.
#
@@ -19,7 +19,7 @@ BUILDLINK_FILES.speex+= include/speex_header.h
BUILDLINK_FILES.speex+= include/speex_stereo.h
BUILDLINK_FILES.speex+= lib/libspeex.*
-.include "../../audio/libogg/buildlink2.mk"
+.include "../../multimedia/libogg/buildlink2.mk"
BUILDLINK_TARGETS+= speex-buildlink
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 0e8597f5ed1..19cb4afa218 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/12 23:15:01 salo Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
@@ -15,6 +15,6 @@ BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1
BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
.endif # SPEEX_BUILDLINK3_MK
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}