Follow libogg into multimedia/.

6 files changed, 16 insertions, 15 deletions

diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 51c542a17dc..45089cc5c95 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $
 #
 
 DISTNAME=	libtheora-1.0alpha3
@@ -10,10 +10,11 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.theora.org/
 COMMENT=	Video codec for Ogg multimedia streaming
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	YES
+USE_LIBTOOL=	YES
 
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk
index aaa3d5a4819..011621ed90f 100644
--- a/multimedia/libtheora/buildlink3.mk
+++ b/multimedia/libtheora/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/04/12 23:22:59 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTHEORA_BUILDLINK3_MK:=	${LIBTHEORA_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.libtheora+=	libtheora>=1.0alpha3
 BUILDLINK_PKGSRCDIR.libtheora?=	../../multimedia/libtheora
 .endif	# LIBTHEORA_BUILDLINK3_MK
 
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index adbdc3631e5..ec8de8c3d4e 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/10 12:44:31 salo Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $
 #
 
 DISTNAME=	mkvtoolnix-0.8.6
@@ -20,11 +20,11 @@ CONFIGURE_ARGS+=	--with-extra-includes=${PREFIX}
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 943040a8af8..918bb7d642d 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/12 21:47:02 salo Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $
 #
 
 DISTNAME=	ogmtools-1.3
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-dvdread-includes=${BUILDLINK_DIR}
 
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index edf646d408c..0d886613131 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/29 21:01:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/12 23:22:59 salo Exp $
 #
 
 DISTNAME=		vlc-0.7.1
@@ -69,7 +69,6 @@ PLIST_SUBST+=	DVDCSS="@comment "
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
@@ -82,6 +81,7 @@ PLIST_SUBST+=	DVDCSS="@comment "
 .include "../../multimedia/libdvdplay/buildlink3.mk"
 .include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index f3acf6b37b0..f2f97791493 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/07 13:04:41 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/04/12 23:22:59 salo Exp $
 #
 # This Makefile fragment is included by packages that use vlc.
 #
@@ -20,7 +20,6 @@ BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
@@ -31,6 +30,7 @@ BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .include "../../misc/libdvdcss/buildlink3.mk"
 .include "../../misc/libdvdplay/buildlink3.mk"
 .include "../../misc/libdvdread/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"