Many changes to pkgsrc for this, but not a version update.

Change PLISTs to not hardcode 1.0.1 (or the version) but use
${PKGVERSION}. This will make it easier for later updates.
print-PLIST target produces ${PKGVERSION} and that is how I noticed this.

Move the xv plugin entries to PLIST.common from PLIST.NetBSD. Linux
and FreeBSD both have same xv plugin entries.

Remove dependency to win32-codecs. It is not needed and can be added
any time later for those extra codecs. Also, xine-lib supports
various Windows Media formats already (via builtin ffmpeg).

Move the i386 PLIST entries to own PLIST.i386 file.

Add MESSAGE.i386 to suggest installing win32-codecs if needed.
(If you have suggestions for other codecs or software to mention,
such as "Real" for this MESSAGE.i386, please let me know.)

Move COMMENT from Makefile.common to Makefile. (I will commit for
xine-arts and xine-esound next, since they didn't have their own
COMMENTs before.)

Bump PKGREVISION.

(Later I will add a couple patches for FreeBSD support and add
theora support.)

8 files changed, 223 insertions, 214 deletions

diff --git a/multimedia/xine-lib/MESSAGE.i386 b/multimedia/xine-lib/MESSAGE.i386
new file mode 100644
index 00000000000..2e8f8849a77
--- /dev/null
+++ b/multimedia/xine-lib/MESSAGE.i386
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE.i386,v 1.1 2005/05/10 00:16:42 reed Exp $
+
+To watch or listen to Windows Media (.asf/.wmv/.wma), such as MS
+WMV 8 or 9 ASF video, or Quicktime files or streams, install the
+multimedia/win32-codecs package.  It is not required by default
+due to unclear licensing.
+
+The win32-codecs package is not needed for MS Windows Media Audio 2
+and MS Windows Media 7 ASF video, because xine-lib already supports
+these formats using built-in ffmpeg.
+
+===========================================================================
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 1ed799c7e30..705d75eeea4 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/05/02 11:29:35 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/10 00:16:42 reed Exp $
 
 .include "Makefile.common"
 
-.if ${MACHINE_ARCH} == "i386"
-DEPENDS+=       	win32-codecs>=011227:../../multimedia/win32-codecs
-PLIST_SUBST+=		I386=""
-.else
-PLIST_SUBST+=		I386="@comment "
-.endif
+PKGREVISION=		1
+COMMENT=		Multimedia player library
 
 BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index c3a0d15782a..d0d65a3300e 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/05/02 11:29:35 drochner Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/05/10 00:16:42 reed Exp $
 #
 
 DISTNAME=		xine-lib-1.0.1
@@ -9,7 +9,6 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
-COMMENT=		Multimedia player library
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
 PATCHDIR=		${.CURDIR}/../../multimedia/xine-lib/patches
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index a1d0a84df40..251735d32a7 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2005/05/07 21:57:02 reed Exp $
-lib/xine/plugins/1.0.1/vidix/cyberblade_vid.a
-lib/xine/plugins/1.0.1/vidix/cyberblade_vid.so
-lib/xine/plugins/1.0.1/vidix/mach64_vid.a
-lib/xine/plugins/1.0.1/vidix/mach64_vid.so
-lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.0.1/vidix/mga_vid.a
-lib/xine/plugins/1.0.1/vidix/mga_vid.so
-lib/xine/plugins/1.0.1/vidix/pm2_vid.a
-lib/xine/plugins/1.0.1/vidix/pm2_vid.so
-lib/xine/plugins/1.0.1/vidix/pm3_vid.a
-lib/xine/plugins/1.0.1/vidix/pm3_vid.so
-lib/xine/plugins/1.0.1/vidix/radeon_vid.a
-lib/xine/plugins/1.0.1/vidix/radeon_vid.so
-lib/xine/plugins/1.0.1/vidix/rage128_vid.a
-lib/xine/plugins/1.0.1/vidix/rage128_vid.so
-lib/xine/plugins/1.0.1/vidix/sis_vid.a
-lib/xine/plugins/1.0.1/vidix/sis_vid.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.so
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.a
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.so
-lib/xine/plugins/1.0.1/xineplug_inp_pvr.a
-lib/xine/plugins/1.0.1/xineplug_inp_pvr.so
-lib/xine/plugins/1.0.1/xineplug_inp_v4l.a
-lib/xine/plugins/1.0.1/xineplug_inp_v4l.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_fb.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_fb.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.4 2005/05/10 00:16:42 reed Exp $
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_alsa.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_alsa.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index 8479616d52d..52ee5de4740 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2005/05/02 11:29:35 drochner Exp $
-lib/xine/plugins/1.0.1/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_sun.so
-${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.so
+@comment $NetBSD: PLIST.NetBSD,v 1.4 2005/05/10 00:16:42 reed Exp $
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index ce56c6e6480..d4f75acbba8 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2005/05/02 11:29:35 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2005/05/10 00:16:42 reed Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -34,166 +34,164 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.a
-lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.0.1/post/xineplug_post_goom.a
-lib/xine/plugins/1.0.1/post/xineplug_post_goom.so
-lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.a
-lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.0.1/post/xineplug_post_planar.a
-lib/xine/plugins/1.0.1/post/xineplug_post_planar.so
-lib/xine/plugins/1.0.1/post/xineplug_post_switch.a
-lib/xine/plugins/1.0.1/post/xineplug_post_switch.so
-lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.a
-lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_file.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_file.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_none.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.1/xineplug_decode_a52.a
-lib/xine/plugins/1.0.1/xineplug_decode_a52.so
-lib/xine/plugins/1.0.1/xineplug_decode_bitplane.a
-lib/xine/plugins/1.0.1/xineplug_decode_bitplane.so
-lib/xine/plugins/1.0.1/xineplug_decode_dts.a
-lib/xine/plugins/1.0.1/xineplug_decode_dts.so
-lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.a
-lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.0.1/xineplug_decode_faad.a
-lib/xine/plugins/1.0.1/xineplug_decode_faad.so
-lib/xine/plugins/1.0.1/xineplug_decode_ff.a
-lib/xine/plugins/1.0.1/xineplug_decode_ff.so
-lib/xine/plugins/1.0.1/xineplug_decode_gsm610.a
-lib/xine/plugins/1.0.1/xineplug_decode_gsm610.so
-lib/xine/plugins/1.0.1/xineplug_decode_image.a
-lib/xine/plugins/1.0.1/xineplug_decode_image.so
-lib/xine/plugins/1.0.1/xineplug_decode_lpcm.a
-lib/xine/plugins/1.0.1/xineplug_decode_lpcm.so
-lib/xine/plugins/1.0.1/xineplug_decode_mad.a
-lib/xine/plugins/1.0.1/xineplug_decode_mad.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpc.a
-lib/xine/plugins/1.0.1/xineplug_decode_mpc.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.a
-lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_decode_nsf.a
-lib/xine/plugins/1.0.1/xineplug_decode_nsf.so
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.a
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.so
-lib/xine/plugins/1.0.1/xineplug_decode_real.a
-lib/xine/plugins/1.0.1/xineplug_decode_real.so
-lib/xine/plugins/1.0.1/xineplug_decode_real_audio.a
-lib/xine/plugins/1.0.1/xineplug_decode_real_audio.so
-lib/xine/plugins/1.0.1/xineplug_decode_rgb.a
-lib/xine/plugins/1.0.1/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.1/xineplug_decode_speex.a
-lib/xine/plugins/1.0.1/xineplug_decode_speex.so
-lib/xine/plugins/1.0.1/xineplug_decode_spu.a
-lib/xine/plugins/1.0.1/xineplug_decode_spu.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucc.a
-lib/xine/plugins/1.0.1/xineplug_decode_spucc.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucmml.a
-lib/xine/plugins/1.0.1/xineplug_decode_spucmml.so
-lib/xine/plugins/1.0.1/xineplug_decode_spudvb.a
-lib/xine/plugins/1.0.1/xineplug_decode_spudvb.so
-lib/xine/plugins/1.0.1/xineplug_decode_sputext.a
-lib/xine/plugins/1.0.1/xineplug_decode_sputext.so
-lib/xine/plugins/1.0.1/xineplug_decode_vorbis.a
-lib/xine/plugins/1.0.1/xineplug_decode_vorbis.so
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.a
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.so
-lib/xine/plugins/1.0.1/xineplug_decode_yuv.a
-lib/xine/plugins/1.0.1/xineplug_decode_yuv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_asf.a
-lib/xine/plugins/1.0.1/xineplug_dmx_asf.so
-lib/xine/plugins/1.0.1/xineplug_dmx_audio.a
-lib/xine/plugins/1.0.1/xineplug_dmx_audio.so
-lib/xine/plugins/1.0.1/xineplug_dmx_avi.a
-lib/xine/plugins/1.0.1/xineplug_dmx_avi.so
-lib/xine/plugins/1.0.1/xineplug_dmx_fli.a
-lib/xine/plugins/1.0.1/xineplug_dmx_fli.so
-lib/xine/plugins/1.0.1/xineplug_dmx_flv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_flv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_games.a
-lib/xine/plugins/1.0.1/xineplug_dmx_games.so
-lib/xine/plugins/1.0.1/xineplug_dmx_iff.a
-lib/xine/plugins/1.0.1/xineplug_dmx_iff.so
-lib/xine/plugins/1.0.1/xineplug_dmx_image.a
-lib/xine/plugins/1.0.1/xineplug_dmx_image.so
-lib/xine/plugins/1.0.1/xineplug_dmx_matroska.a
-lib/xine/plugins/1.0.1/xineplug_dmx_matroska.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mng.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mng.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.0.1/xineplug_dmx_nsv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_nsv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_ogg.a
-lib/xine/plugins/1.0.1/xineplug_dmx_ogg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_pva.a
-lib/xine/plugins/1.0.1/xineplug_dmx_pva.so
-lib/xine/plugins/1.0.1/xineplug_dmx_qt.a
-lib/xine/plugins/1.0.1/xineplug_dmx_qt.so
-lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_real.a
-lib/xine/plugins/1.0.1/xineplug_dmx_real.so
-lib/xine/plugins/1.0.1/xineplug_dmx_slave.a
-lib/xine/plugins/1.0.1/xineplug_dmx_slave.so
-lib/xine/plugins/1.0.1/xineplug_dmx_sputext.a
-lib/xine/plugins/1.0.1/xineplug_dmx_sputext.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.0.1/xineplug_flac.a
-lib/xine/plugins/1.0.1/xineplug_flac.so
-lib/xine/plugins/1.0.1/xineplug_inp_cdda.a
-lib/xine/plugins/1.0.1/xineplug_inp_cdda.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvb.a
-lib/xine/plugins/1.0.1/xineplug_inp_dvb.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvd.a
-lib/xine/plugins/1.0.1/xineplug_inp_dvd.so
-lib/xine/plugins/1.0.1/xineplug_inp_file.a
-lib/xine/plugins/1.0.1/xineplug_inp_file.so
-lib/xine/plugins/1.0.1/xineplug_inp_http.a
-lib/xine/plugins/1.0.1/xineplug_inp_http.so
-lib/xine/plugins/1.0.1/xineplug_inp_mms.a
-lib/xine/plugins/1.0.1/xineplug_inp_mms.so
-lib/xine/plugins/1.0.1/xineplug_inp_net.a
-lib/xine/plugins/1.0.1/xineplug_inp_net.so
-lib/xine/plugins/1.0.1/xineplug_inp_pnm.a
-lib/xine/plugins/1.0.1/xineplug_inp_pnm.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtp.a
-lib/xine/plugins/1.0.1/xineplug_inp_rtp.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtsp.a
-lib/xine/plugins/1.0.1/xineplug_inp_rtsp.so
-lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.0.1/xineplug_inp_vcd.a
-lib/xine/plugins/1.0.1/xineplug_inp_vcd.so
-lib/xine/plugins/1.0.1/xineplug_inp_vcdo.a
-lib/xine/plugins/1.0.1/xineplug_inp_vcdo.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_aa.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_aa.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_none.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_none.so
-${OPENGL_PLUGIN}lib/xine/plugins/1.0.1/xineplug_vo_out_opengl.a
-${OPENGL_PLUGIN}lib/xine/plugins/1.0.1/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_sdl.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_sdl.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_xshm.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_xshm.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_audio_filters.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_audio_filters.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_goom.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_goom.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_mosaico.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_mosaico.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_planar.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_planar.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_switch.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_switch.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_tvtime.a
+${HAVE_XV}lib/xine/plugins/${PKGVERSION}/post/xineplug_post_tvtime.so
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_visualizations.a
+lib/xine/plugins/${PKGVERSION}/post/xineplug_post_visualizations.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_file.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_file.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_none.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_none.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_a52.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_a52.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_bitplane.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_bitplane.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dts.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dts.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dvaudio.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dvaudio.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_faad.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_faad.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_ff.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_ff.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_gsm610.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_gsm610.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_image.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_image.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_lpcm.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_lpcm.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mad.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mad.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpc.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpc.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpeg2.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpeg2.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_nsf.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_nsf.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_real.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_real.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_real_audio.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_real_audio.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_rgb.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_rgb.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_speex.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_speex.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spu.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spu.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucc.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucc.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucmml.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucmml.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spudvb.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_spudvb.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_sputext.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_sputext.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_vorbis.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_vorbis.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_yuv.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_yuv.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_asf.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_asf.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_audio.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_audio.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_avi.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_avi.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_fli.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_fli.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_flv.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_flv.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_games.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_games.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_iff.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_iff.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_image.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_image.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_matroska.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_matroska.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mng.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mng.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_nsv.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_nsv.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_ogg.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_ogg.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_pva.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_pva.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_qt.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_qt.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_rawdv.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_rawdv.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_real.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_real.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_slave.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_slave.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_sputext.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_sputext.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/${PKGVERSION}/xineplug_flac.a
+lib/xine/plugins/${PKGVERSION}/xineplug_flac.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_cdda.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_cdda.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvb.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvb.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvd.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvd.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_file.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_file.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_http.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_http.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_mms.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_mms.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_net.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_net.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pnm.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pnm.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtp.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtp.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtsp.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtsp.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcd.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcd.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcdo.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcdo.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_aa.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_aa.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_none.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_none.so
+${OPENGL_PLUGIN}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_opengl.a
+${OPENGL_PLUGIN}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_opengl.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_sdl.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_sdl.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xshm.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xshm.so
+${HAVE_XV}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xv.a
+${HAVE_XV}lib/xine/plugins/${PKGVERSION}/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.common_end b/multimedia/xine-lib/PLIST.common_end
index 3710d598581..21511cbdbc0 100644
--- a/multimedia/xine-lib/PLIST.common_end
+++ b/multimedia/xine-lib/PLIST.common_end
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2005/05/02 11:29:35 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2005/05/10 00:16:42 reed Exp $
 @dirrm share/xine/libxine1/fonts
 @dirrm share/xine/libxine1
 @dirrm share/xine
 @dirrm share/doc/xine/hackersguide
 @dirrm share/doc/xine/faq
 @dirrm share/doc/xine
-@exec ${MKDIR} %D/lib/xine/plugins/1.0.1/vidix
-@dirrm lib/xine/plugins/1.0.1/vidix
-@dirrm lib/xine/plugins/1.0.1/post
+@exec ${MKDIR} %D/lib/xine/plugins/${PKGVERSION}/vidix
+@dirrm lib/xine/plugins/${PKGVERSION}/vidix
+@dirrm lib/xine/plugins/${PKGVERSION}/post
 @dirrm lib/xine/plugins/1.0.1
 @dirrm lib/xine/plugins
 @dirrm lib/xine
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
new file mode 100644
index 00000000000..6e37c67825e
--- /dev/null
+++ b/multimedia/xine-lib/PLIST.i386
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.i386,v 1.3 2005/05/10 00:16:42 reed Exp $
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_qt.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_qt.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_w32dll.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_w32dll.so