From c0aa01561acfb61e45ff6e70acc9e794066e08c3 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 11 Aug 2014 23:09:44 +0000
Subject: Switch to ffmpeg1 instead of ffmpeg.

Note: some of these packages didn't build for me, e.g. osg, so I couldn't
verify them all.
---
 mbone/vic-devel/Makefile   | 4 ++--
 mbone/vic-devel/options.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mbone')

diff --git a/mbone/vic-devel/Makefile b/mbone/vic-devel/Makefile
index 979fa889a1e..fa74a1872c5 100644
--- a/mbone/vic-devel/Makefile
+++ b/mbone/vic-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2014/04/10 05:39:15 obache Exp $
+# $NetBSD: Makefile,v 1.16 2014/08/11 23:09:44 wiz Exp $
 
 DISTNAME=	vic-2.8ucl1.4.0beta-4337
 PKGNAME=	vic-devel-2.8.1.4.0beta.4337
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	mbone tk
 MASTER_SITES=	http://www.NetBSD.org/~sborrill/snapshots/
 
diff --git a/mbone/vic-devel/options.mk b/mbone/vic-devel/options.mk
index b62cb472587..3570cba0172 100644
--- a/mbone/vic-devel/options.mk
+++ b/mbone/vic-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2013/01/27 00:15:03 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2014/08/11 23:09:44 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vic
 PKG_SUPPORTED_OPTIONS=		inet6 # vic-gpl
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--disable-ffmpeg-co
 CONFIGURE_ARGS+=	--disable-x264-co
 CONFIGURE_ARGS+=	--with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg}/include
 CONFIGURE_ARGS+=	--with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg}/lib
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--with-x264inc=${BUILDLINK_PREFIX.x264-devel}/include
 CONFIGURE_ARGS+=	--with-x264lib=${BUILDLINK_PREFIX.x264-devel}/lib
-- 
cgit v1.2.3