Add a variable XINE_MOD_DIR_VER that contains the subdirectory name

for the modules. Use it in xine-lib and its dependencies.

Fixes a bug in xine-esound and installation of wip/xine-xcb.

9 files changed, 246 insertions, 244 deletions

diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 8ac6ca2e146..06828c9b91c 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2008/04/15 19:25:28 drochner Exp $
+# $NetBSD: Makefile.common,v 1.50 2008/04/24 12:32:22 wiz Exp $
 #
 
 # used by audio/xine-arts/Makefile
@@ -15,7 +15,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
 
 XINE_LIB_VER=		1.1.12
+XINE_MOD_DIR_VER=	1.21
 PLIST_SUBST+=		XINE_LIB_VER=${XINE_LIB_VER:Q}
+PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
 PATCHDIR=		${.CURDIR}/../../multimedia/xine-lib/patches
diff --git a/multimedia/xine-lib/PLIST.DragonFly b/multimedia/xine-lib/PLIST.DragonFly
index 0fd81109d0b..d0a2c1e5c53 100644
--- a/multimedia/xine-lib/PLIST.DragonFly
+++ b/multimedia/xine-lib/PLIST.DragonFly
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.4 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/xineplug_ao_out_oss.so
-lib/xine/plugins/1.21/xineplug_ao_out_oss.a
+@comment $NetBSD: PLIST.DragonFly,v 1.5 2008/04/24 12:32:22 wiz Exp $
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index 7f48b44631b..51229ebe492 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.5 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/vidix/cyberblade_vid.a
-lib/xine/plugins/1.21/vidix/cyberblade_vid.so
-lib/xine/plugins/1.21/vidix/mach64_vid.a
-lib/xine/plugins/1.21/vidix/mach64_vid.so
-lib/xine/plugins/1.21/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.21/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.21/vidix/mga_vid.a
-lib/xine/plugins/1.21/vidix/mga_vid.so
-lib/xine/plugins/1.21/vidix/nvidia_vid.a
-lib/xine/plugins/1.21/vidix/nvidia_vid.so
-lib/xine/plugins/1.21/vidix/pm2_vid.a
-lib/xine/plugins/1.21/vidix/pm2_vid.so
-lib/xine/plugins/1.21/vidix/pm3_vid.a
-lib/xine/plugins/1.21/vidix/pm3_vid.so
-lib/xine/plugins/1.21/vidix/radeon_vid.a
-lib/xine/plugins/1.21/vidix/radeon_vid.so
-lib/xine/plugins/1.21/vidix/rage128_vid.a
-lib/xine/plugins/1.21/vidix/rage128_vid.so
-lib/xine/plugins/1.21/vidix/savage_vid.a
-lib/xine/plugins/1.21/vidix/savage_vid.so
-lib/xine/plugins/1.21/vidix/sis_vid.a
-lib/xine/plugins/1.21/vidix/sis_vid.so
-lib/xine/plugins/1.21/vidix/unichrome_vid.a
-lib/xine/plugins/1.21/vidix/unichrome_vid.so
-lib/xine/plugins/1.21/xineplug_ao_out_oss.a
-lib/xine/plugins/1.21/xineplug_ao_out_oss.so
-lib/xine/plugins/1.21/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.21/xineplug_vo_out_vidix.so
+@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
+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
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 5c07c553d20..85cecd0595c 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.10 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/vidix/cyberblade_vid.a
-lib/xine/plugins/1.21/vidix/cyberblade_vid.so
-lib/xine/plugins/1.21/vidix/mach64_vid.a
-lib/xine/plugins/1.21/vidix/mach64_vid.so
-lib/xine/plugins/1.21/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.21/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.21/vidix/mga_vid.a
-lib/xine/plugins/1.21/vidix/mga_vid.so
-lib/xine/plugins/1.21/vidix/pm2_vid.a
-lib/xine/plugins/1.21/vidix/pm2_vid.so
-lib/xine/plugins/1.21/vidix/pm3_vid.a
-lib/xine/plugins/1.21/vidix/pm3_vid.so
-lib/xine/plugins/1.21/vidix/radeon_vid.a
-lib/xine/plugins/1.21/vidix/radeon_vid.so
-lib/xine/plugins/1.21/vidix/rage128_vid.a
-lib/xine/plugins/1.21/vidix/rage128_vid.so
-lib/xine/plugins/1.21/vidix/sis_vid.a
-lib/xine/plugins/1.21/vidix/sis_vid.so
-lib/xine/plugins/1.21/xineplug_ao_out_oss.a
-lib/xine/plugins/1.21/xineplug_ao_out_oss.so
-lib/xine/plugins/1.21/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/1.21/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.21/xineplug_decode_dxr3_video.a
-lib/xine/plugins/1.21/xineplug_decode_dxr3_video.so
-lib/xine/plugins/1.21/xineplug_inp_pvr.a
-lib/xine/plugins/1.21/xineplug_inp_pvr.so
-lib/xine/plugins/1.21/xineplug_inp_v4l.a
-lib/xine/plugins/1.21/xineplug_inp_v4l.so
-lib/xine/plugins/1.21/xineplug_vo_out_dxr3.a
-lib/xine/plugins/1.21/xineplug_vo_out_dxr3.so
-lib/xine/plugins/1.21/xineplug_vo_out_fb.a
-lib/xine/plugins/1.21/xineplug_vo_out_fb.so
-lib/xine/plugins/1.21/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.21/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.11 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/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/sis_vid.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_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_decode_dxr3_spu.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pvr.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pvr.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_v4l.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_v4l.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.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
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index e55ef2696cb..a3cbda34f59 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.9 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/xineplug_ao_out_oss.a
-lib/xine/plugins/1.21/xineplug_ao_out_oss.so
-lib/xine/plugins/1.21/xineplug_ao_out_sun.a
-lib/xine/plugins/1.21/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.NetBSD,v 1.10 2008/04/24 12:32:22 wiz Exp $
+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_ao_out_sun.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.SunOS b/multimedia/xine-lib/PLIST.SunOS
index 43a7455df2d..7772c4d0fe3 100644
--- a/multimedia/xine-lib/PLIST.SunOS
+++ b/multimedia/xine-lib/PLIST.SunOS
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.SunOS,v 1.5 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/xineplug_ao_out_sun.a
-lib/xine/plugins/1.21/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.SunOS,v 1.6 2008/04/24 12:32:22 wiz Exp $
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_sun.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 8fbf691807b..2252989b012 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.25 2008/04/15 19:25:28 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.26 2008/04/24 12:32:22 wiz Exp $
 bin/xine-config
 bin/xine-list-1.1
 include/xine.h
@@ -41,163 +41,163 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-lib/xine/plugins/1.21/mime.types
-lib/xine/plugins/1.21/post/xineplug_post_audio_filters.a
-lib/xine/plugins/1.21/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.21/post/xineplug_post_goom.a
-lib/xine/plugins/1.21/post/xineplug_post_goom.so
-lib/xine/plugins/1.21/post/xineplug_post_mosaico.a
-lib/xine/plugins/1.21/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.21/post/xineplug_post_planar.a
-lib/xine/plugins/1.21/post/xineplug_post_planar.so
-lib/xine/plugins/1.21/post/xineplug_post_switch.a
-lib/xine/plugins/1.21/post/xineplug_post_switch.so
-${PLIST.xv}lib/xine/plugins/1.21/post/xineplug_post_tvtime.a
-${PLIST.xv}lib/xine/plugins/1.21/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.21/post/xineplug_post_visualizations.a
-lib/xine/plugins/1.21/post/xineplug_post_visualizations.so
-lib/xine/plugins/1.21/xineplug_ao_out_file.a
-lib/xine/plugins/1.21/xineplug_ao_out_file.so
-lib/xine/plugins/1.21/xineplug_ao_out_none.a
-lib/xine/plugins/1.21/xineplug_ao_out_none.so
-lib/xine/plugins/1.21/xineplug_decode_a52.a
-lib/xine/plugins/1.21/xineplug_decode_a52.so
-lib/xine/plugins/1.21/xineplug_decode_bitplane.a
-lib/xine/plugins/1.21/xineplug_decode_bitplane.so
-lib/xine/plugins/1.21/xineplug_decode_dts.a
-lib/xine/plugins/1.21/xineplug_decode_dts.so
-lib/xine/plugins/1.21/xineplug_decode_dvaudio.a
-lib/xine/plugins/1.21/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.21/xineplug_decode_faad.a
-lib/xine/plugins/1.21/xineplug_decode_faad.so
-lib/xine/plugins/1.21/xineplug_decode_ff.a
-lib/xine/plugins/1.21/xineplug_decode_ff.so
-lib/xine/plugins/1.21/xineplug_decode_gsm610.a
-lib/xine/plugins/1.21/xineplug_decode_gsm610.so
-@comment lib/xine/plugins/1.21/xineplug_decode_image.a
-@comment lib/xine/plugins/1.21/xineplug_decode_image.so
-lib/xine/plugins/1.21/xineplug_decode_lpcm.a
-lib/xine/plugins/1.21/xineplug_decode_lpcm.so
-lib/xine/plugins/1.21/xineplug_decode_mad.a
-lib/xine/plugins/1.21/xineplug_decode_mad.so
-lib/xine/plugins/1.21/xineplug_decode_mpc.a
-lib/xine/plugins/1.21/xineplug_decode_mpc.so
-lib/xine/plugins/1.21/xineplug_decode_mpeg2.a
-lib/xine/plugins/1.21/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.21/xineplug_decode_nsf.a
-lib/xine/plugins/1.21/xineplug_decode_nsf.so
-lib/xine/plugins/1.21/xineplug_decode_real.a
-lib/xine/plugins/1.21/xineplug_decode_real.so
-lib/xine/plugins/1.21/xineplug_decode_rgb.a
-lib/xine/plugins/1.21/xineplug_decode_rgb.so
-lib/xine/plugins/1.21/xineplug_decode_speex.a
-lib/xine/plugins/1.21/xineplug_decode_speex.so
-lib/xine/plugins/1.21/xineplug_decode_spu.a
-lib/xine/plugins/1.21/xineplug_decode_spu.so
-lib/xine/plugins/1.21/xineplug_decode_spucc.a
-lib/xine/plugins/1.21/xineplug_decode_spucc.so
-lib/xine/plugins/1.21/xineplug_decode_spucmml.a
-lib/xine/plugins/1.21/xineplug_decode_spucmml.so
-lib/xine/plugins/1.21/xineplug_decode_spudvb.a
-lib/xine/plugins/1.21/xineplug_decode_spudvb.so
-lib/xine/plugins/1.21/xineplug_decode_sputext.a
-lib/xine/plugins/1.21/xineplug_decode_sputext.so
-lib/xine/plugins/1.21/xineplug_decode_theora.a
-lib/xine/plugins/1.21/xineplug_decode_theora.so
-lib/xine/plugins/1.21/xineplug_decode_vorbis.a
-lib/xine/plugins/1.21/xineplug_decode_vorbis.so
-lib/xine/plugins/1.21/xineplug_decode_yuv.a
-lib/xine/plugins/1.21/xineplug_decode_yuv.so
-lib/xine/plugins/1.21/xineplug_dmx_asf.a
-lib/xine/plugins/1.21/xineplug_dmx_asf.so
-lib/xine/plugins/1.21/xineplug_dmx_audio.a
-lib/xine/plugins/1.21/xineplug_dmx_audio.so
-lib/xine/plugins/1.21/xineplug_dmx_avi.a
-lib/xine/plugins/1.21/xineplug_dmx_avi.so
-lib/xine/plugins/1.21/xineplug_dmx_fli.a
-lib/xine/plugins/1.21/xineplug_dmx_fli.so
-lib/xine/plugins/1.21/xineplug_dmx_flv.a
-lib/xine/plugins/1.21/xineplug_dmx_flv.so
-lib/xine/plugins/1.21/xineplug_dmx_games.a
-lib/xine/plugins/1.21/xineplug_dmx_games.so
-lib/xine/plugins/1.21/xineplug_dmx_iff.a
-lib/xine/plugins/1.21/xineplug_dmx_iff.so
-@comment lib/xine/plugins/1.21/xineplug_dmx_image.a
-@comment lib/xine/plugins/1.21/xineplug_dmx_image.so
-lib/xine/plugins/1.21/xineplug_dmx_matroska.a
-lib/xine/plugins/1.21/xineplug_dmx_matroska.so
-lib/xine/plugins/1.21/xineplug_dmx_mng.a
-lib/xine/plugins/1.21/xineplug_dmx_mng.so
-lib/xine/plugins/1.21/xineplug_dmx_mpeg.a
-lib/xine/plugins/1.21/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/1.21/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.21/xineplug_dmx_nsv.a
-lib/xine/plugins/1.21/xineplug_dmx_nsv.so
-lib/xine/plugins/1.21/xineplug_dmx_ogg.a
-lib/xine/plugins/1.21/xineplug_dmx_ogg.so
-lib/xine/plugins/1.21/xineplug_dmx_pva.a
-lib/xine/plugins/1.21/xineplug_dmx_pva.so
-lib/xine/plugins/1.21/xineplug_dmx_qt.a
-lib/xine/plugins/1.21/xineplug_dmx_qt.so
-lib/xine/plugins/1.21/xineplug_dmx_rawdv.a
-lib/xine/plugins/1.21/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.21/xineplug_dmx_real.a
-lib/xine/plugins/1.21/xineplug_dmx_real.so
-lib/xine/plugins/1.21/xineplug_dmx_slave.a
-lib/xine/plugins/1.21/xineplug_dmx_slave.so
-lib/xine/plugins/1.21/xineplug_dmx_sputext.a
-lib/xine/plugins/1.21/xineplug_dmx_sputext.so
-lib/xine/plugins/1.21/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/1.21/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.21/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/1.21/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.21/xineplug_inp_cdda.a
-lib/xine/plugins/1.21/xineplug_inp_cdda.so
-lib/xine/plugins/1.21/xineplug_inp_dvb.a
-lib/xine/plugins/1.21/xineplug_inp_dvb.so
-lib/xine/plugins/1.21/xineplug_inp_dvd.a
-lib/xine/plugins/1.21/xineplug_inp_dvd.so
-lib/xine/plugins/1.21/xineplug_inp_file.a
-lib/xine/plugins/1.21/xineplug_inp_file.so
-lib/xine/plugins/1.21/xineplug_inp_http.a
-lib/xine/plugins/1.21/xineplug_inp_http.so
-lib/xine/plugins/1.21/xineplug_inp_mms.a
-lib/xine/plugins/1.21/xineplug_inp_mms.so
-lib/xine/plugins/1.21/xineplug_inp_net.a
-lib/xine/plugins/1.21/xineplug_inp_net.so
-lib/xine/plugins/1.21/xineplug_inp_pnm.a
-lib/xine/plugins/1.21/xineplug_inp_pnm.so
-lib/xine/plugins/1.21/xineplug_inp_rtp.a
-lib/xine/plugins/1.21/xineplug_inp_rtp.so
-lib/xine/plugins/1.21/xineplug_inp_rtsp.a
-lib/xine/plugins/1.21/xineplug_inp_rtsp.so
-lib/xine/plugins/1.21/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/1.21/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.21/xineplug_inp_vcd.a
-lib/xine/plugins/1.21/xineplug_inp_vcd.so
-lib/xine/plugins/1.21/xineplug_inp_vcdo.a
-lib/xine/plugins/1.21/xineplug_inp_vcdo.so
-@comment lib/xine/plugins/1.21/xineplug_vo_out_aa.a
-@comment lib/xine/plugins/1.21/xineplug_vo_out_aa.so
-lib/xine/plugins/1.21/xineplug_vo_out_none.a
-lib/xine/plugins/1.21/xineplug_vo_out_none.so
-@comment lib/xine/plugins/1.21/xineplug_vo_out_opengl.a
-@comment lib/xine/plugins/1.21/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.21/xineplug_vo_out_raw.a
-lib/xine/plugins/1.21/xineplug_vo_out_raw.so
-@comment lib/xine/plugins/1.21/xineplug_vo_out_sdl.a
-@comment lib/xine/plugins/1.21/xineplug_vo_out_sdl.so
-lib/xine/plugins/1.21/xineplug_vo_out_xshm.a
-lib/xine/plugins/1.21/xineplug_vo_out_xshm.so
-${PLIST.xv}lib/xine/plugins/1.21/xineplug_vo_out_xv.a
-${PLIST.xv}lib/xine/plugins/1.21/xineplug_vo_out_xv.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/mime.types
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_audio_filters.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_audio_filters.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_goom.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_goom.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_mosaico.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_mosaico.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_planar.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_planar.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_switch.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_switch.so
+${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_tvtime.a
+${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_tvtime.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_visualizations.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_visualizations.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_file.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_file.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_none.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_none.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_faad.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_faad.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.so
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_image.a
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_image.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mad.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mad.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpc.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpc.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpeg2.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpeg2.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_nsf.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_nsf.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_real.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_real.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rgb.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rgb.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_speex.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_speex.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucc.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucc.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucmml.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucmml.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_sputext.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_sputext.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_theora.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_theora.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vorbis.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vorbis.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_yuv.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_yuv.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_audio.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_audio.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_avi.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_avi.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_fli.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_fli.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_flv.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_flv.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_games.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_games.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_iff.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_iff.so
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_image.a
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_image.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_matroska.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_matroska.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mng.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mng.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_nsv.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_nsv.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_ogg.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_ogg.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_pva.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_pva.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_sputext.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_sputext.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.a
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_none.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_none.so
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.a
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.so
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.a
+@comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.so
+${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.a
+${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 man/man1/xine-list-1.1.1
 man/man5/xine.5
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 9442f473d9d..9aa9b7e0664 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.10 2008/04/15 19:25:28 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.11 2008/04/24 12:32:22 wiz Exp $
 @dirrm share/xine/libxine1/fonts
 @dirrm share/xine/libxine1
 @dirrm share/xine
 @dirrm share/doc/xine-lib/hackersguide
 @dirrm share/doc/xine-lib
-@exec ${MKDIR} %D/lib/xine/plugins/1.21/vidix
-@dirrm lib/xine/plugins/1.21/vidix
-@dirrm lib/xine/plugins/1.21/post
-@dirrm lib/xine/plugins/1.21
+@exec ${MKDIR} %D/lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix
+@dirrm lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix
+@dirrm lib/xine/plugins/${XINE_MOD_DIR_VER}/post
+@dirrm lib/xine/plugins/${XINE_MOD_DIR_VER}
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm include/xine
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
index a80da6e1977..5a9ddad6a4d 100644
--- a/multimedia/xine-lib/PLIST.i386
+++ b/multimedia/xine-lib/PLIST.i386
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.i386,v 1.7 2008/04/15 19:25:28 drochner Exp $
-lib/xine/plugins/1.21/xineplug_decode_qt.a
-lib/xine/plugins/1.21/xineplug_decode_qt.so
-lib/xine/plugins/1.21/xineplug_decode_w32dll.a
-lib/xine/plugins/1.21/xineplug_decode_w32dll.so
+@comment $NetBSD: PLIST.i386,v 1.8 2008/04/24 12:32:22 wiz Exp $
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so