Fix the PLIST handling of the SDL option. Problem reported by Amitai Schlair.diff -r1.38 -r1.39 pkgsrc/multimedia/ffmpeg/Makefile
(ahoka)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/09/08 00:16:35 ahoka Exp $
+# $NetBSD: Makefile,v 1.39 2008/09/08 17:57:02 ahoka Exp $
DISTNAME= ffmpeg-${DISTVERSION}
PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_FREEBSD}
EXTRACT_SUFX= .tar.bz2
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2008/09/07 23:39:37 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/09/08 17:57:02 ahoka Exp $
bin/ffmpeg
-bin/ffplay
bin/ffserver
+${PLIST.sdl}bin/ffplay
+${PLIST.sdl}man/man1/ffplay.1
include/libavcodec/avcodec.h
include/libavcodec/opt.h
include/libavdevice/avdevice.h
@@ -65,7 +66,6 @@
lib/pkgconfig/libpostproc.pc
lib/pkgconfig/libswscale.pc
man/man1/ffmpeg.1
-man/man1/ffplay.1
man/man1/ffserver.1
share/doc/ffmpeg/README
share/doc/ffmpeg/TODO
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/09/07 23:39:37 ahoka Exp $
+# $NetBSD: options.mk,v 1.8 2008/09/08 17:57:02 ahoka Exp $
# Global and legacy options
@@ -11,6 +11,8 @@
.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+= sdl
+
###
### faad option
###
@@ -37,11 +39,11 @@
###
.if !empty(PKG_OPTIONS:Msdl)
-
CONFIGURE_ARGS+= --enable-ffplay
-PLIST_SRC+= ${PKGDIR}/PLIST.sdl
-
+PLIST.sdl= yes
.include "../../devel/SDL/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-ffplay
.endif
###