Split up PLIST into PLIST.common, PLIST.Linux and PLIST.NetBSD.

(If you use another platform, please share your details.)

This fixes a problem where under Linux, the sun and xv
plugins are not installed and then 36 additional new plugins
are installed (Linux only). (Thank you to Sebastian Prause
for Linux PLIST information.)

Use PLIST_SUBST for the i386 files and remove PLIST.i386.

5 files changed, 51 insertions, 13 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 259bba39846..db0a7819ad9 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2004/05/12 16:37:07 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/29 02:14:27 reed Exp $
 #
 
 .include "Makefile.common"
 
 .if ${MACHINE_ARCH} == "i386"
 DEPENDS+=       	win32-codecs>=011227:../../multimedia/win32-codecs
-PLIST_SRC=		${PKGDIR}/PLIST.i386
+PLIST_SUBST+=		I386=""
+.else
+PLIST_SUBST+=		I386="@comment "
 .endif
-PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
new file mode 100644
index 00000000000..5b18b0b5375
--- /dev/null
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2004/05/29 02:14:27 reed Exp $
+lib/xine/plugins/1.0.0/vidix/cyberblade_vid.a
+lib/xine/plugins/1.0.0/vidix/cyberblade_vid.so
+lib/xine/plugins/1.0.0/vidix/mach64_vid.a
+lib/xine/plugins/1.0.0/vidix/mach64_vid.so
+lib/xine/plugins/1.0.0/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.0.0/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.0.0/vidix/mga_vid.a
+lib/xine/plugins/1.0.0/vidix/mga_vid.so
+lib/xine/plugins/1.0.0/vidix/pm2_vid.a
+lib/xine/plugins/1.0.0/vidix/pm2_vid.so
+lib/xine/plugins/1.0.0/vidix/pm3_vid.a
+lib/xine/plugins/1.0.0/vidix/pm3_vid.so
+lib/xine/plugins/1.0.0/vidix/radeon_vid.a
+lib/xine/plugins/1.0.0/vidix/radeon_vid.so
+lib/xine/plugins/1.0.0/vidix/rage128_vid.a
+lib/xine/plugins/1.0.0/vidix/rage128_vid.so
+lib/xine/plugins/1.0.0/vidix/sis_vid.a
+lib/xine/plugins/1.0.0/vidix/sis_vid.so
+lib/xine/plugins/1.0.0/xineplug_ao_out_alsa.a
+lib/xine/plugins/1.0.0/xineplug_ao_out_alsa.so
+lib/xine/plugins/1.0.0/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.a
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.0.0/xineplug_inp_pvr.a
+lib/xine/plugins/1.0.0/xineplug_inp_pvr.so
+lib/xine/plugins/1.0.0/xineplug_inp_v4l.a
+lib/xine/plugins/1.0.0/xineplug_inp_v4l.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_fb.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_fb.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
new file mode 100644
index 00000000000..115d22229b1
--- /dev/null
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2004/05/29 02:14:27 reed Exp $
+lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a
+lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
+${XV_WORKAROUND}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
diff --git a/multimedia/xine-lib/PLIST b/multimedia/xine-lib/PLIST.common
index e93c11e3683..a9d9d79e560 100644
--- a/multimedia/xine-lib/PLIST
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/16 14:55:30 mycroft Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2004/05/29 02:14:27 reed Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -52,8 +52,6 @@ lib/xine/plugins/1.0.0/xineplug_ao_out_file.a
 lib/xine/plugins/1.0.0/xineplug_ao_out_file.so
 lib/xine/plugins/1.0.0/xineplug_ao_out_none.a
 lib/xine/plugins/1.0.0/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so
 lib/xine/plugins/1.0.0/xineplug_decode_a52.a
 lib/xine/plugins/1.0.0/xineplug_decode_a52.so
 lib/xine/plugins/1.0.0/xineplug_decode_bitplane.a
@@ -78,6 +76,8 @@ lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.a
 lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so
 lib/xine/plugins/1.0.0/xineplug_decode_nsf.a
 lib/xine/plugins/1.0.0/xineplug_decode_nsf.so
+${I386}lib/xine/plugins/1.0.0/xineplug_decode_qt.a
+${I386}lib/xine/plugins/1.0.0/xineplug_decode_qt.so
 lib/xine/plugins/1.0.0/xineplug_decode_real.a
 lib/xine/plugins/1.0.0/xineplug_decode_real.so
 lib/xine/plugins/1.0.0/xineplug_decode_real_audio.a
@@ -92,6 +92,8 @@ lib/xine/plugins/1.0.0/xineplug_decode_sputext.a
 lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
 lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a
 lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so
+${I386}lib/xine/plugins/1.0.0/xineplug_decode_w32dll.a
+${I386}lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so
 lib/xine/plugins/1.0.0/xineplug_decode_yuv.a
 lib/xine/plugins/1.0.0/xineplug_decode_yuv.so
 lib/xine/plugins/1.0.0/xineplug_dmx_asf.a
@@ -180,8 +182,6 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.a
 lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.a
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
-${XV_WORKAROUND}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 share/aclocal/xine.m4
 share/doc/xine/README
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
deleted file mode 100644
index 32f2f86e9fb..00000000000
--- a/multimedia/xine-lib/PLIST.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1.1.1 2004/01/26 13:03:25 jmmv Exp $
-lib/xine/plugins/1.0.0/xineplug_decode_qt.a
-lib/xine/plugins/1.0.0/xineplug_decode_qt.so
-lib/xine/plugins/1.0.0/xineplug_decode_w32dll.a
-lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so