Use the extended PLIST_SRC support which now also reads:

PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
and remove the package hack for MD PLIST files.

Split PLIST into PLIST.common and PLIST.common_end to fix an error while
removing the package.
Also remove the trailing space at the two plist manpage entries, which
caused an warning during package installation.

3 files changed, 30 insertions, 34 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8292251c17f..df970dff2ca 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/01 15:08:35 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/02/21 21:04:06 veego Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -22,11 +22,6 @@ VLC_VER=		0.7.2
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_SRC=		${PKGDIR}/PLIST
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc"
-PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH}
-.endif
-
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=        --disable-vcd
 CONFIGURE_ARGS+=	--disable-skins2
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST.common
index 79da096eb22..bad1a5d8784 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/01 15:08:35 ben Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:04:06 veego Exp $
 bin/vlc
 bin/vlc-config
 bin/wxvlc
@@ -161,14 +161,14 @@ lib/vlc/video_output/libvout_sdl_plugin.so
 lib/vlc/video_output/libx11_plugin.so
 lib/vlc/video_output/libxvideo_plugin.so
 lib/vlc/visualization/libvisual_plugin.so
+man/man1/vlc-config.1
+man/man1/vlc.1
 share/doc/vlc/bugreport-howto.txt
 share/doc/vlc/fortunes.txt
 share/doc/vlc/intf-cdda.txt
 share/doc/vlc/intf-vcd.txt
 share/doc/vlc/vlc-howto.sgml
 share/doc/vlc/web-streaming.html
-man/man1/vlc.1 
-man/man1/vlc-config.1 
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vlc.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/vlc.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/vlc.mo
@@ -272,28 +272,3 @@ share/vlc/vlc32x32.png
 share/vlc/vlc32x32.xpm
 share/vlc/vlc48x48.ico
 share/vlc/vlc48x48.png
-@dirrm share/vlc/skins/default
-@dirrm share/vlc/skins
-@dirrm share/vlc/http/admin
-@dirrm share/vlc/http
-@dirrm share/vlc
-@dirrm share/doc/vlc
-@dirrm lib/vlc/visualization
-@dirrm lib/vlc/video_output
-@dirrm lib/vlc/video_filter
-@dirrm lib/vlc/video_chroma
-@dirrm lib/vlc/stream_out
-@dirrm lib/vlc/packetizer
-@dirrm lib/vlc/mux
-@dirrm lib/vlc/misc
-@dirrm lib/vlc/gui
-@dirrm lib/vlc/demux
-@dirrm lib/vlc/control
-@dirrm lib/vlc/codec
-@dirrm lib/vlc/audio_output
-@dirrm lib/vlc/audio_mixer
-@dirrm lib/vlc/audio_filter
-@dirrm lib/vlc/access_output
-@dirrm lib/vlc/access
-@dirrm lib/vlc
-@dirrm include/vlc
diff --git a/multimedia/vlc/PLIST.common_end b/multimedia/vlc/PLIST.common_end
new file mode 100644
index 00000000000..abf755676cd
--- /dev/null
+++ b/multimedia/vlc/PLIST.common_end
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:04:06 veego Exp $
+@dirrm share/vlc/skins/default
+@dirrm share/vlc/skins
+@dirrm share/vlc/http/admin
+@dirrm share/vlc/http
+@dirrm share/vlc
+@dirrm share/doc/vlc
+@dirrm lib/vlc/visualization
+@dirrm lib/vlc/video_output
+@dirrm lib/vlc/video_filter
+@dirrm lib/vlc/video_chroma
+@dirrm lib/vlc/stream_out
+@dirrm lib/vlc/packetizer
+@dirrm lib/vlc/mux
+@dirrm lib/vlc/misc
+@dirrm lib/vlc/gui
+@dirrm lib/vlc/demux
+@dirrm lib/vlc/control
+@dirrm lib/vlc/codec
+@dirrm lib/vlc/audio_output
+@dirrm lib/vlc/audio_mixer
+@dirrm lib/vlc/audio_filter
+@dirrm lib/vlc/access_output
+@dirrm lib/vlc/access
+@dirrm lib/vlc
+@dirrm include/vlc