Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/graphics/osg/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/graphics/osg/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.39
retrieving revision 1.49
diff -u -p -r1.39 -r1.49
--- pkgsrc/graphics/osg/Makefile	2013/09/01 12:14:07	1.39
+++ pkgsrc/graphics/osg/Makefile	2014/08/13 08:24:51	1.49
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2013/09/01 12:14:07 obache Exp $
+# $NetBSD: Makefile,v 1.49 2014/08/13 08:24:51 wiz Exp $
 
 DISTNAME=	OpenSceneGraph-3.0.1
 PKGNAME=	osg-3.0.1
-PKGREVISION=	21
+PKGREVISION=	31
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/
 EXTRACT_SUFX=	.zip
@@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE=	packaging/pkgconfig/
 PKGCONFIG_OVERRIDE+=	packaging/pkgconfig/openthreads.pc.in
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg1}
 
 PLIST_VARS+=	quartz x11
 
@@ -35,7 +36,7 @@ PLIST.x11=	yes
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif
 
@@ -45,7 +46,7 @@ PLIST.x11=	yes
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"