multimedia/xine-lib: Fix PLIST issues on fbsd x86_64

* Vidix output is not available on FreeBSD x86_64, conditionalize it in the PLIST.
* add missing vcdo input plugin in the PLIST

OK@ wiz

2 files changed, 37 insertions, 28 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 0a5539e604b..c32e6f41508 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2014/12/30 13:34:59 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2014/12/31 16:10:41 rumko Exp $
 
 .include "Makefile.common"
 
@@ -32,6 +32,13 @@ SUBST_MESSAGE.w32path=	Fixing win32 dll path.
 # Needed to fix build problems under, at least, NetBSD/amd64.
 BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
 
+.if ${OPSYS} == "FreeBSD"
+PLIST_VARS+=	vidix
+.if ${MACHINE_ARCH} == "i386"
+PLIST.vidix=	yes
+.endif
+.endif
+
 PLIST_VARS+=	qtw32
 .if empty(MACHINE_PLATFORM:MDarwin-*-i386)
 PLIST.qtw32=	yes
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index 51229ebe492..f27e03b147a 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,29 +1,31 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.6 2008/04/24 12:32:22 wiz Exp $
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.7 2014/12/31 16:10:41 rumko Exp $
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.a
+${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.so