summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2006-09-26 07:27:19 +0000
committermartti <martti@pkgsrc.org>2006-09-26 07:27:19 +0000
commitd415d9a421bf52c4ec81c8fb729d3817e0a7d8a3 (patch)
tree6ea2e588fc54d5b7b9cc4852d24f74ae35c9645c /multimedia/vlc
parent5dc90dcbd31534bcd4a266fd61bb3b844bf466f7 (diff)
downloadpkgsrc-d415d9a421bf52c4ec81c8fb729d3817e0a7d8a3.tar.gz
Moved vlc08 to vlc.
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/MESSAGE.NetBSD9
-rw-r--r--multimedia/vlc/Makefile71
-rw-r--r--multimedia/vlc/PLIST438
-rw-r--r--multimedia/vlc/PLIST.Linux-i3862
-rw-r--r--multimedia/vlc/PLIST.common275
-rw-r--r--multimedia/vlc/PLIST.common_end26
-rw-r--r--multimedia/vlc/PLIST.i3868
-rw-r--r--multimedia/vlc/PLIST.powerpc3
-rw-r--r--multimedia/vlc/distinfo18
-rw-r--r--multimedia/vlc/hacks.mk8
-rw-r--r--multimedia/vlc/patches/patch-aa27
-rw-r--r--multimedia/vlc/patches/patch-ab213
-rw-r--r--multimedia/vlc/patches/patch-ac22
-rw-r--r--multimedia/vlc/patches/patch-ad22
-rw-r--r--multimedia/vlc/patches/patch-ae13
-rw-r--r--multimedia/vlc/patches/patch-ag12
-rw-r--r--multimedia/vlc/patches/patch-ah18
-rw-r--r--multimedia/vlc/patches/patch-ai202
18 files changed, 749 insertions, 638 deletions
diff --git a/multimedia/vlc/MESSAGE.NetBSD b/multimedia/vlc/MESSAGE.NetBSD
deleted file mode 100644
index 190e5eb07b6..00000000000
--- a/multimedia/vlc/MESSAGE.NetBSD
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2004/03/29 10:30:29 grant Exp $
-
-You may need to increase the maximum number of shared memory pages
-(SHMMAXPGS) in your kernel to run ${PKGNAME}. One possible setting is:
-
- options SHMMAXPGS=32768
-
-===========================================================================
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index eef5011e87c..350c063c92c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/06/12 16:28:13 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/09/26 07:27:19 martti Exp $
#
DISTNAME= vlc-${VLC_VER}
-PKGREVISION= 15
+PKGREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
EXTRACT_SUFX= .tar.bz2
@@ -11,13 +11,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
COMMENT= VideoLAN Client
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake pkg-config
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake perl pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
+USE_LANGUAGES= c c++
-VLC_VER= 0.7.2
+VLC_VER= 0.8.5
.include "../../mk/bsd.prefs.mk"
@@ -29,26 +30,39 @@ BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
CONFIGURE_ARGS+= --disable-skins2
CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
-
-CONFIGURE_ARGS+= --enable-dvb
-CONFIGURE_ARGS+= --enable-flac
CONFIGURE_ARGS+= --disable-gtk
-CONFIGURE_ARGS+= --with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
-
-BUILD_DEFS+= WITH_DVDCSS
+CONFIGURE_ARGS+= --disable-gnomevfs
+CONFIGURE_ARGS+= --disable-gnutls
+CONFIGURE_ARGS+= --disable-smb
+CONFIGURE_ARGS+= --disable-dvbpsi
+CONFIGURE_ARGS+= --disable-mod
+CONFIGURE_ARGS+= --disable-mpc
+CONFIGURE_ARGS+= --disable-dts
-.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
-.include "../../multimedia/libdvdcss/buildlink3.mk"
-PLIST_SUBST+= DVDCSS=
-.else
-CONFIGURE_ARGS+= --disable-dvd
-PLIST_SUBST+= DVDCSS="@comment "
-.endif
+CONFIGURE_ARGS+= --with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
+CONFIGURE_ARGS+= --with-ffmpeg-zlib
+CONFIGURE_ARGS+= --enable-cddax
+CONFIGURE_ARGS+= --enable-dvdread
+CONFIGURE_ARGS+= --enable-faad
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/dialogs
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/images
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/js
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old/admin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old/vlm
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/requests
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/selected
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/selection
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/volume
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selected
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/volume
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/unselect
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selection
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2/fonts
${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1
@@ -73,7 +87,15 @@ SUBST_SED.libav= -e "s,libavcodec/libavcodec.a,libavcodec.a,g"
BUILDLINK_TRANSFORM.ffmpeg+= -e "s,include/ffmpeg,include/,g"
-.include "../../audio/flac/buildlink3.mk"
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+= COND_CDDA="@comment "
+PLIST_SUBST+= COND_VCD="@comment "
+.else
+PLIST_SUBST+= COND_CDDA=""
+PLIST_SUBST+= COND_VCD=""
+.endif
+
+.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/liba52/buildlink3.mk"
.include "../../audio/libcddb/buildlink3.mk"
@@ -83,18 +105,17 @@ BUILDLINK_TRANSFORM.ffmpeg+= -e "s,include/ffmpeg,include/,g"
.include "../../converters/fribidi/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../misc/libcdio/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.include "../../multimedia/libdvdplay/buildlink3.mk"
.include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../multimedia/libmatroska/buildlink3.mk"
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
-.include "../../sysutils/vcdimager-devel/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
new file mode 100644
index 00000000000..02b9f1b1baa
--- /dev/null
+++ b/multimedia/vlc/PLIST
@@ -0,0 +1,438 @@
+@comment $NetBSD: PLIST,v 1.7 2006/09/26 07:27:19 martti Exp $
+bin/vlc
+bin/vlc-config
+bin/wxvlc
+include/vlc/aout.h
+include/vlc/decoder.h
+include/vlc/input.h
+include/vlc/intf.h
+include/vlc/libvlc.h
+include/vlc/mediacontrol.h
+include/vlc/mediacontrol_structures.h
+include/vlc/sout.h
+include/vlc/vlc.h
+include/vlc/vout.h
+lib/libvlc.a
+lib/vlc/access/libaccess_directory_plugin.so
+lib/vlc/access/libaccess_fake_plugin.so
+lib/vlc/access/libaccess_file_plugin.so
+lib/vlc/access/libaccess_ftp_plugin.so
+lib/vlc/access/libaccess_http_plugin.so
+lib/vlc/access/libaccess_mms_plugin.so
+lib/vlc/access/libaccess_tcp_plugin.so
+lib/vlc/access/libaccess_udp_plugin.so
+${COND_CDDA}lib/vlc/access/libcdda_plugin.so
+lib/vlc/access/libcddax_plugin.so
+lib/vlc/access/libdvdnav_plugin.so
+lib/vlc/access/libdvdread_plugin.so
+lib/vlc/access/libscreen_plugin.so
+${COND_VCD}lib/vlc/access/libvcd_plugin.so
+lib/vlc/access_filter/libaccess_filter_record_plugin.so
+lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so
+lib/vlc/access_output/libaccess_output_dummy_plugin.so
+lib/vlc/access_output/libaccess_output_file_plugin.so
+lib/vlc/access_output/libaccess_output_http_plugin.so
+lib/vlc/access_output/libaccess_output_udp_plugin.so
+lib/vlc/audio_filter/liba52tofloat32_plugin.so
+lib/vlc/audio_filter/liba52tospdif_plugin.so
+lib/vlc/audio_filter/libaudio_format_plugin.so
+lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
+lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so
+lib/vlc/audio_filter/libdtstospdif_plugin.so
+lib/vlc/audio_filter/libequalizer_plugin.so
+lib/vlc/audio_filter/libfixed32tofloat32_plugin.so
+lib/vlc/audio_filter/libfixed32tos16_plugin.so
+lib/vlc/audio_filter/libfloat32tos16_plugin.so
+lib/vlc/audio_filter/libfloat32tos8_plugin.so
+lib/vlc/audio_filter/libfloat32tou16_plugin.so
+lib/vlc/audio_filter/libfloat32tou8_plugin.so
+lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
+lib/vlc/audio_filter/liblinear_resampler_plugin.so
+lib/vlc/audio_filter/libmpgatofixed32_plugin.so
+lib/vlc/audio_filter/libnormvol_plugin.so
+lib/vlc/audio_filter/libparam_eq_plugin.so
+lib/vlc/audio_filter/libs16tofixed32_plugin.so
+lib/vlc/audio_filter/libs16tofloat32_plugin.so
+lib/vlc/audio_filter/libs16tofloat32swab_plugin.so
+lib/vlc/audio_filter/libs8tofloat32_plugin.so
+lib/vlc/audio_filter/libsimple_channel_mixer_plugin.so
+lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
+lib/vlc/audio_filter/libtrivial_resampler_plugin.so
+lib/vlc/audio_filter/libu8tofixed32_plugin.so
+lib/vlc/audio_filter/libu8tofloat32_plugin.so
+lib/vlc/audio_filter/libugly_resampler_plugin.so
+lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
+lib/vlc/audio_mixer/libspdif_mixer_plugin.so
+lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
+lib/vlc/audio_output/libaout_file_plugin.so
+lib/vlc/audio_output/libaout_sdl_plugin.so
+lib/vlc/audio_output/liboss_plugin.so
+lib/vlc/codec/liba52_plugin.so
+lib/vlc/codec/libadpcm_plugin.so
+lib/vlc/codec/libaraw_plugin.so
+lib/vlc/codec/libcinepak_plugin.so
+lib/vlc/codec/libcmml_plugin.so
+lib/vlc/codec/libcvdsub_plugin.so
+lib/vlc/codec/libdts_plugin.so
+lib/vlc/codec/libdvbsub_plugin.so
+lib/vlc/codec/libfaad_plugin.so
+lib/vlc/codec/libfake_plugin.so
+lib/vlc/codec/libflacdec_plugin.so
+lib/vlc/codec/liblibmpeg2_plugin.so
+lib/vlc/codec/liblpcm_plugin.so
+lib/vlc/codec/libmpeg_audio_plugin.so
+lib/vlc/codec/libpng_plugin.so
+lib/vlc/codec/librawvideo_plugin.so
+lib/vlc/codec/libsdl_image_plugin.so
+lib/vlc/codec/libspudec_plugin.so
+lib/vlc/codec/libsubsdec_plugin.so
+lib/vlc/codec/libsvcdsub_plugin.so
+lib/vlc/codec/libvorbis_plugin.so
+lib/vlc/control/libgestures_plugin.so
+lib/vlc/control/libhotkeys_plugin.so
+lib/vlc/control/libhttp_plugin.so
+lib/vlc/control/libnetsync_plugin.so
+lib/vlc/control/librc_plugin.so
+lib/vlc/control/libshowintf_plugin.so
+lib/vlc/control/libtelnet_plugin.so
+lib/vlc/demux/liba52sys_plugin.so
+lib/vlc/demux/libaiff_plugin.so
+lib/vlc/demux/libasf_plugin.so
+lib/vlc/demux/libau_plugin.so
+lib/vlc/demux/libavi_plugin.so
+lib/vlc/demux/libdemuxdump_plugin.so
+lib/vlc/demux/libdtssys_plugin.so
+lib/vlc/demux/libflac_plugin.so
+lib/vlc/demux/libh264_plugin.so
+lib/vlc/demux/libid3tag_plugin.so
+lib/vlc/demux/libm3u_plugin.so
+lib/vlc/demux/libm4a_plugin.so
+lib/vlc/demux/libm4v_plugin.so
+lib/vlc/demux/libmjpeg_plugin.so
+lib/vlc/demux/libmp4_plugin.so
+lib/vlc/demux/libmpga_plugin.so
+lib/vlc/demux/libmpgv_plugin.so
+lib/vlc/demux/libnsc_plugin.so
+lib/vlc/demux/libnsv_plugin.so
+lib/vlc/demux/libnuv_plugin.so
+lib/vlc/demux/libogg_plugin.so
+lib/vlc/demux/libplaylist_plugin.so
+lib/vlc/demux/libps_plugin.so
+lib/vlc/demux/libpva_plugin.so
+lib/vlc/demux/librawdv_plugin.so
+lib/vlc/demux/libreal_plugin.so
+lib/vlc/demux/libsgimb_plugin.so
+lib/vlc/demux/libsubtitle_plugin.so
+lib/vlc/demux/libty_plugin.so
+lib/vlc/demux/libvobsub_plugin.so
+lib/vlc/demux/libvoc_plugin.so
+lib/vlc/demux/libwav_plugin.so
+lib/vlc/demux/libxa_plugin.so
+lib/vlc/gui/libwxwidgets_plugin.so
+lib/vlc/libffmpeg.a
+lib/vlc/libi420_rgb_mmx.a
+lib/vlc/libi420_ymga_mmx.a
+lib/vlc/libi420_yuy2_mmx.a
+lib/vlc/libi422_yuy2_mmx.a
+lib/vlc/libmemcpy3dn.a
+lib/vlc/libmemcpymmx.a
+lib/vlc/libmemcpymmxext.a
+lib/vlc/libmkv.a
+lib/vlc/libstream_out_switcher.a
+lib/vlc/misc/libdummy_plugin.so
+lib/vlc/misc/libexport_plugin.so
+lib/vlc/misc/libfreetype_plugin.so
+lib/vlc/misc/libgrowl_plugin.so
+lib/vlc/misc/libipv4_plugin.so
+lib/vlc/misc/libipv6_plugin.so
+lib/vlc/misc/liblogger_plugin.so
+lib/vlc/misc/libmemcpy_plugin.so
+lib/vlc/misc/libscreensaver_plugin.so
+lib/vlc/misc/libvod_rtsp_plugin.so
+lib/vlc/misc/libxml_plugin.so
+lib/vlc/misc/libxtag_plugin.so
+lib/vlc/mux/libmux_asf_plugin.so
+lib/vlc/mux/libmux_avi_plugin.so
+lib/vlc/mux/libmux_dummy_plugin.so
+lib/vlc/mux/libmux_mp4_plugin.so
+lib/vlc/mux/libmux_mpjpeg_plugin.so
+lib/vlc/mux/libmux_ogg_plugin.so
+lib/vlc/mux/libmux_ps_plugin.so
+lib/vlc/mux/libmux_wav_plugin.so
+lib/vlc/packetizer/libpacketizer_copy_plugin.so
+lib/vlc/packetizer/libpacketizer_h264_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
+lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
+lib/vlc/services_discovery/libpodcast_plugin.so
+lib/vlc/services_discovery/libsap_plugin.so
+lib/vlc/services_discovery/libshout_plugin.so
+lib/vlc/stream_out/libstream_out_bridge_plugin.so
+lib/vlc/stream_out/libstream_out_description_plugin.so
+lib/vlc/stream_out/libstream_out_display_plugin.so
+lib/vlc/stream_out/libstream_out_dummy_plugin.so
+lib/vlc/stream_out/libstream_out_duplicate_plugin.so
+lib/vlc/stream_out/libstream_out_es_plugin.so
+lib/vlc/stream_out/libstream_out_gather_plugin.so
+lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so
+lib/vlc/stream_out/libstream_out_rtp_plugin.so
+lib/vlc/stream_out/libstream_out_standard_plugin.so
+lib/vlc/stream_out/libstream_out_transcode_plugin.so
+lib/vlc/video_chroma/libi420_rgb_plugin.so
+lib/vlc/video_chroma/libi420_ymga_plugin.so
+lib/vlc/video_chroma/libi420_yuy2_plugin.so
+lib/vlc/video_chroma/libi422_yuy2_plugin.so
+lib/vlc/video_filter/libadjust_plugin.so
+lib/vlc/video_filter/libblend_plugin.so
+lib/vlc/video_filter/libclone_plugin.so
+lib/vlc/video_filter/libcrop_plugin.so
+lib/vlc/video_filter/libdeinterlace_plugin.so
+lib/vlc/video_filter/libdistort_plugin.so
+lib/vlc/video_filter/libinvert_plugin.so
+lib/vlc/video_filter/liblogo_plugin.so
+lib/vlc/video_filter/libmagnify_plugin.so
+lib/vlc/video_filter/libmarq_plugin.so
+lib/vlc/video_filter/libmosaic_plugin.so
+lib/vlc/video_filter/libmotionblur_plugin.so
+lib/vlc/video_filter/libmotiondetect_plugin.so
+lib/vlc/video_filter/libosdmenu_plugin.so
+lib/vlc/video_filter/librss_plugin.so
+lib/vlc/video_filter/librv32_plugin.so
+lib/vlc/video_filter/libscale_plugin.so
+lib/vlc/video_filter/libtime_plugin.so
+lib/vlc/video_filter/libtransform_plugin.so
+lib/vlc/video_filter/libwall_plugin.so
+lib/vlc/video_output/libglx_plugin.so
+lib/vlc/video_output/libimage_plugin.so
+lib/vlc/video_output/libopengl_plugin.so
+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/locale/ca/LC_MESSAGES/vlc.mo
+share/locale/da/LC_MESSAGES/vlc.mo
+share/locale/de/LC_MESSAGES/vlc.mo
+share/locale/en_GB/LC_MESSAGES/vlc.mo
+share/locale/es/LC_MESSAGES/vlc.mo
+share/locale/fr/LC_MESSAGES/vlc.mo
+share/locale/gl/LC_MESSAGES/vlc.mo
+share/locale/he/LC_MESSAGES/vlc.mo
+share/locale/hi/LC_MESSAGES/vlc.mo
+share/locale/hu/LC_MESSAGES/vlc.mo
+share/locale/it/LC_MESSAGES/vlc.mo
+share/locale/ja/LC_MESSAGES/vlc.mo
+share/locale/ka/LC_MESSAGES/vlc.mo
+share/locale/ko/LC_MESSAGES/vlc.mo
+share/locale/nl/LC_MESSAGES/vlc.mo
+share/locale/oc/LC_MESSAGES/vlc.mo
+share/locale/pt_BR/LC_MESSAGES/vlc.mo
+share/locale/ro/LC_MESSAGES/vlc.mo
+share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/sv/LC_MESSAGES/vlc.mo
+share/locale/tr/LC_MESSAGES/vlc.mo
+share/locale/zh_CN/LC_MESSAGES/vlc.mo
+share/locale/zh_TW/LC_MESSAGES/vlc.mo
+share/vlc/http/.hosts
+share/vlc/http/dialogs/.hosts
+share/vlc/http/dialogs/browse
+share/vlc/http/dialogs/footer
+share/vlc/http/dialogs/input
+share/vlc/http/dialogs/main
+share/vlc/http/dialogs/mosaic
+share/vlc/http/dialogs/playlist
+share/vlc/http/dialogs/sout
+share/vlc/http/dialogs/vlm
+share/vlc/http/favicon.ico
+share/vlc/http/iehacks.css
+share/vlc/http/images/delete.png
+share/vlc/http/images/delete_small.png
+share/vlc/http/images/eject.png
+share/vlc/http/images/empty.png
+share/vlc/http/images/fullscreen.png
+share/vlc/http/images/help.png
+share/vlc/http/images/info.png
+share/vlc/http/images/loop.png
+share/vlc/http/images/minus.png
+share/vlc/http/images/next.png
+share/vlc/http/images/pause.png
+share/vlc/http/images/play.png
+share/vlc/http/images/playlist.png
+share/vlc/http/images/playlist_small.png
+share/vlc/http/images/plus.png
+share/vlc/http/images/prev.png
+share/vlc/http/images/refresh.png
+share/vlc/http/images/repeat.png
+share/vlc/http/images/sd.png
+share/vlc/http/images/shuffle.png
+share/vlc/http/images/slider_bar.png
+share/vlc/http/images/slider_left.png
+share/vlc/http/images/slider_point.png
+share/vlc/http/images/slider_right.png
+share/vlc/http/images/slow.png
+share/vlc/http/images/sort.png
+share/vlc/http/images/sout.png
+share/vlc/http/images/speaker.png
+share/vlc/http/images/speaker_mute.png
+share/vlc/http/images/stop.png
+share/vlc/http/images/vlc16x16.png
+share/vlc/http/images/volume_down.png
+share/vlc/http/images/volume_up.png
+share/vlc/http/images/white.png
+share/vlc/http/images/white_cross_small.png
+share/vlc/http/index.html
+share/vlc/http/js/functions.js
+share/vlc/http/js/mosaic.js
+share/vlc/http/js/vlm.js
+share/vlc/http/mosaic.html
+share/vlc/http/old/.hosts
+share/vlc/http/old/admin/.access
+share/vlc/http/old/admin/browse.html
+share/vlc/http/old/admin/dboxfiles.html
+share/vlc/http/old/admin/index.html
+share/vlc/http/old/cone_minus.png
+share/vlc/http/old/cone_plus.png
+share/vlc/http/old/index.html
+share/vlc/http/old/info.html
+share/vlc/http/old/style.css
+share/vlc/http/old/vlm/edit.html
+share/vlc/http/old/vlm/index.html
+share/vlc/http/old/vlm/new.html
+share/vlc/http/old/vlm/show.html
+share/vlc/http/old/webcam.html
+share/vlc/http/requests/browse.xml
+share/vlc/http/requests/playlist.xml
+share/vlc/http/requests/readme
+share/vlc/http/requests/status.xml
+share/vlc/http/requests/vlm.xml
+share/vlc/http/requests/vlm_cmd.xml
+share/vlc/http/style.css
+share/vlc/http/vlm.html
+share/vlc/http/vlm_export.html
+share/vlc/osdmenu/default.cfg
+share/vlc/osdmenu/default/selected/bw.png
+share/vlc/osdmenu/default/selected/esc.png
+share/vlc/osdmenu/default/selected/fw.png
+share/vlc/osdmenu/default/selected/next.png
+share/vlc/osdmenu/default/selected/play_pause.png
+share/vlc/osdmenu/default/selected/previous.png
+share/vlc/osdmenu/default/selected/stop.png
+share/vlc/osdmenu/default/selected/volume.png
+share/vlc/osdmenu/default/selection/bw.png
+share/vlc/osdmenu/default/selection/esc.png
+share/vlc/osdmenu/default/selection/fw.png
+share/vlc/osdmenu/default/selection/next.png
+share/vlc/osdmenu/default/selection/play_pause.png
+share/vlc/osdmenu/default/selection/previous.png
+share/vlc/osdmenu/default/selection/stop.png
+share/vlc/osdmenu/default/selection/volume.png
+share/vlc/osdmenu/default/unselected.png
+share/vlc/osdmenu/default/volume/volume_00.png
+share/vlc/osdmenu/default/volume/volume_01.png
+share/vlc/osdmenu/default/volume/volume_02.png
+share/vlc/osdmenu/default/volume/volume_03.png
+share/vlc/osdmenu/default/volume/volume_04.png
+share/vlc/osdmenu/default/volume/volume_05.png
+share/vlc/osdmenu/default/volume/volume_06.png
+share/vlc/osdmenu/default/volume/volume_07.png
+share/vlc/osdmenu/default/volume/volume_08.png
+share/vlc/osdmenu/default/volume/volume_09.png
+share/vlc/osdmenu/default/volume/volume_10.png
+share/vlc/osdmenu/dvd.cfg
+share/vlc/osdmenu/dvd/selected/bw.png
+share/vlc/osdmenu/dvd/selected/esc.png
+share/vlc/osdmenu/dvd/selected/fw.png
+share/vlc/osdmenu/dvd/selected/mute.png
+share/vlc/osdmenu/dvd/selected/next.png
+share/vlc/osdmenu/dvd/selected/pause.png
+share/vlc/osdmenu/dvd/selected/play.png
+share/vlc/osdmenu/dvd/selected/previous.png
+share/vlc/osdmenu/dvd/selected/slow.png
+share/vlc/osdmenu/dvd/selected/stop.png
+share/vlc/osdmenu/dvd/selected/volume.png
+share/vlc/osdmenu/dvd/selection/bw.png
+share/vlc/osdmenu/dvd/selection/esc.png
+share/vlc/osdmenu/dvd/selection/fw.png
+share/vlc/osdmenu/dvd/selection/mute.png
+share/vlc/osdmenu/dvd/selection/next.png
+share/vlc/osdmenu/dvd/selection/pause.png
+share/vlc/osdmenu/dvd/selection/play.png
+share/vlc/osdmenu/dvd/selection/previous.png
+share/vlc/osdmenu/dvd/selection/slow.png
+share/vlc/osdmenu/dvd/selection/stop.png
+share/vlc/osdmenu/dvd/unselect/barroff.png
+share/vlc/osdmenu/dvd/volume/volume00.png
+share/vlc/osdmenu/dvd/volume/volume01.png
+share/vlc/osdmenu/dvd/volume/volume02.png
+share/vlc/osdmenu/dvd/volume/volume03.png
+share/vlc/osdmenu/dvd/volume/volume04.png
+share/vlc/osdmenu/dvd/volume/volume05.png
+share/vlc/pda-forwardb16x16.xpm
+share/vlc/pda-openb16x16.xpm
+share/vlc/pda-pauseb16x16.xpm
+share/vlc/pda-playb16x16.xpm
+share/vlc/pda-playlistb16x16.xpm
+share/vlc/pda-preferencesb16x16.xpm
+share/vlc/pda-rewindb16x16.xpm
+share/vlc/pda-stopb16x16.xpm
+share/vlc/skins2/default.vlt
+share/vlc/skins2/fonts/FreeSans.ttf
+share/vlc/skins2/fonts/FreeSansBold.ttf
+share/vlc/skins2/skin.catalog
+share/vlc/skins2/skin.dtd
+share/vlc/skins2/winamp2.xml
+share/vlc/vlc128x128.png
+share/vlc/vlc16x16.png
+share/vlc/vlc16x16.xpm
+share/vlc/vlc32x32.png
+share/vlc/vlc32x32.xpm
+share/vlc/vlc48x48.ico
+share/vlc/vlc48x48.png
+@dirrm share/vlc/skins2/fonts
+@dirrm share/vlc/skins2
+@dirrm share/vlc/osdmenu/dvd/volume
+@dirrm share/vlc/osdmenu/dvd/unselect
+@dirrm share/vlc/osdmenu/dvd/selection
+@dirrm share/vlc/osdmenu/dvd/selected
+@dirrm share/vlc/osdmenu/dvd
+@dirrm share/vlc/osdmenu/default/volume
+@dirrm share/vlc/osdmenu/default/selection
+@dirrm share/vlc/osdmenu/default/selected
+@dirrm share/vlc/osdmenu/default
+@dirrm share/vlc/osdmenu
+@dirrm share/vlc/http/requests
+@dirrm share/vlc/http/old/vlm
+@dirrm share/vlc/http/old/admin
+@dirrm share/vlc/http/old
+@dirrm share/vlc/http/js
+@dirrm share/vlc/http/images
+@dirrm share/vlc/http/dialogs
+@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/services_discovery
+@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_filter
+@dirrm lib/vlc/access
+@dirrm lib/vlc
+@dirrm include/vlc
diff --git a/multimedia/vlc/PLIST.Linux-i386 b/multimedia/vlc/PLIST.Linux-i386
deleted file mode 100644
index 7f69a99c23a..00000000000
--- a/multimedia/vlc/PLIST.Linux-i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux-i386,v 1.1 2005/03/05 14:24:48 grant Exp $
-lib/vlc/video_output/libfb_plugin.so
diff --git a/multimedia/vlc/PLIST.common b/multimedia/vlc/PLIST.common
deleted file mode 100644
index 394c66fcdcc..00000000000
--- a/multimedia/vlc/PLIST.common
+++ /dev/null
@@ -1,275 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.5 2006/05/19 10:38:02 joerg Exp $
-bin/vlc
-bin/vlc-config
-bin/wxvlc
-include/vlc/aout.h
-include/vlc/decoder.h
-include/vlc/input.h
-include/vlc/intf.h
-include/vlc/sout.h
-include/vlc/vlc.h
-include/vlc/vout.h
-lib/libvlc.a
-lib/vlc/access/libaccess_directory_plugin.so
-lib/vlc/access/libaccess_file_plugin.so
-lib/vlc/access/libaccess_ftp_plugin.so
-lib/vlc/access/libaccess_http_plugin.so
-lib/vlc/access/libaccess_mms_plugin.so
-lib/vlc/access/libaccess_tcp_plugin.so
-lib/vlc/access/libaccess_udp_plugin.so
-lib/vlc/access/libcddax_plugin.so
-${DVDCSS}lib/vlc/access/libdvd_plugin.so
-lib/vlc/access/libdvdplay_plugin.so
-lib/vlc/access/libdvdread_plugin.so
-lib/vlc/access/libslp_plugin.so
-lib/vlc/access/libvcdx_plugin.so
-lib/vlc/access_output/libaccess_output_dummy_plugin.so
-lib/vlc/access_output/libaccess_output_file_plugin.so
-lib/vlc/access_output/libaccess_output_http_plugin.so
-lib/vlc/access_output/libaccess_output_udp_plugin.so
-lib/vlc/audio_filter/liba52tofloat32_plugin.so
-lib/vlc/audio_filter/liba52tospdif_plugin.so
-lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
-lib/vlc/audio_filter/libdtstospdif_plugin.so
-lib/vlc/audio_filter/libfixed32tofloat32_plugin.so
-lib/vlc/audio_filter/libfixed32tos16_plugin.so
-lib/vlc/audio_filter/libfloat32tos16_plugin.so
-lib/vlc/audio_filter/libfloat32tos8_plugin.so
-lib/vlc/audio_filter/libfloat32tou16_plugin.so
-lib/vlc/audio_filter/libfloat32tou8_plugin.so
-lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
-lib/vlc/audio_filter/liblinear_resampler_plugin.so
-lib/vlc/audio_filter/libmpgatofixed32_plugin.so
-lib/vlc/audio_filter/libs16tofixed32_plugin.so
-lib/vlc/audio_filter/libs16tofloat32_plugin.so
-lib/vlc/audio_filter/libs16tofloat32swab_plugin.so
-lib/vlc/audio_filter/libs8tofloat32_plugin.so
-lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
-lib/vlc/audio_filter/libtrivial_resampler_plugin.so
-lib/vlc/audio_filter/libu8tofixed32_plugin.so
-lib/vlc/audio_filter/libu8tofloat32_plugin.so
-lib/vlc/audio_filter/libugly_resampler_plugin.so
-lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
-lib/vlc/audio_mixer/libspdif_mixer_plugin.so
-lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
-lib/vlc/audio_output/libaout_file_plugin.so
-lib/vlc/audio_output/libaout_sdl_plugin.so
-lib/vlc/audio_output/liboss_plugin.so
-lib/vlc/codec/liba52_plugin.so
-lib/vlc/codec/libadpcm_plugin.so
-lib/vlc/codec/libaraw_plugin.so
-lib/vlc/codec/libcinepak_plugin.so
-lib/vlc/codec/libcmml_plugin.so
-lib/vlc/codec/libcvdsub_plugin.so
-lib/vlc/codec/libdts_plugin.so
-lib/vlc/codec/libdvbsub_plugin.so
-lib/vlc/codec/libflacdec_plugin.so
-lib/vlc/codec/liblibmpeg2_plugin.so
-lib/vlc/codec/liblpcm_plugin.so
-lib/vlc/codec/libmpeg_audio_plugin.so
-lib/vlc/codec/librawvideo_plugin.so
-lib/vlc/codec/libspudec_plugin.so
-lib/vlc/codec/libsubsdec_plugin.so
-lib/vlc/codec/libsvcdsub_plugin.so
-lib/vlc/codec/libvorbis_plugin.so
-lib/vlc/control/libgestures_plugin.so
-lib/vlc/control/libhotkeys_plugin.so
-lib/vlc/control/libhttp_plugin.so
-lib/vlc/control/librc_plugin.so
-lib/vlc/control/libtelnet_plugin.so
-lib/vlc/demux/liba52sys_plugin.so
-lib/vlc/demux/libaac_plugin.so
-lib/vlc/demux/libaiff_plugin.so
-lib/vlc/demux/libasf_plugin.so
-lib/vlc/demux/libau_plugin.so
-lib/vlc/demux/libavi_plugin.so
-lib/vlc/demux/libdvdnav_plugin.so
-lib/vlc/demux/libdemux2_plugin.so
-lib/vlc/demux/libdemuxdump_plugin.so
-lib/vlc/demux/libdemuxsub_plugin.so
-lib/vlc/demux/libdtssys_plugin.so
-lib/vlc/demux/libflac_plugin.so
-lib/vlc/demux/libh264_plugin.so
-lib/vlc/demux/libid3_plugin.so
-lib/vlc/demux/libid3tag_plugin.so
-lib/vlc/demux/libm3u_plugin.so
-lib/vlc/demux/libm4v_plugin.so
-lib/vlc/demux/libmp4_plugin.so
-lib/vlc/demux/libmpeg_system_plugin.so
-lib/vlc/demux/libmpga_plugin.so
-lib/vlc/demux/libmpgv_plugin.so
-lib/vlc/demux/libnsv_plugin.so
-lib/vlc/demux/libogg_plugin.so
-lib/vlc/demux/libplaylist_plugin.so
-lib/vlc/demux/libps2_plugin.so
-lib/vlc/demux/libps_plugin.so
-lib/vlc/demux/libpva_plugin.so
-lib/vlc/demux/librawdv_plugin.so
-lib/vlc/demux/libreal_plugin.so
-lib/vlc/demux/libsgimb_plugin.so
-lib/vlc/demux/libts2_plugin.so
-lib/vlc/demux/libts_dvbpsi_plugin.so
-lib/vlc/demux/libts_plugin.so
-lib/vlc/demux/libwav_plugin.so
-lib/vlc/gui/libwxwindows_plugin.so
-lib/vlc/libffmpeg.a
-lib/vlc/libmkv.a
-lib/vlc/libstream_out_transcode.a
-lib/vlc/misc/libdummy_plugin.so
-lib/vlc/misc/libexport_plugin.so
-lib/vlc/misc/libfreetype_plugin.so
-lib/vlc/misc/libipv4_plugin.so
-lib/vlc/misc/libipv6_plugin.so
-lib/vlc/misc/liblogger_plugin.so
-lib/vlc/misc/libmemcpy_plugin.so
-lib/vlc/misc/libsap_plugin.so
-lib/vlc/misc/libscreensaver_plugin.so
-lib/vlc/mux/libmux_asf_plugin.so
-lib/vlc/mux/libmux_avi_plugin.so
-lib/vlc/mux/libmux_dummy_plugin.so
-lib/vlc/mux/libmux_mp4_plugin.so
-lib/vlc/mux/libmux_ogg_plugin.so
-lib/vlc/mux/libmux_ps_plugin.so
-lib/vlc/mux/libmux_ts_dvbpsi_plugin.so
-lib/vlc/mux/libmux_ts_plugin.so
-lib/vlc/packetizer/libpacketizer_copy_plugin.so
-lib/vlc/packetizer/libpacketizer_h264_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
-lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
-lib/vlc/stream_out/libstream_out_display_plugin.so
-lib/vlc/stream_out/libstream_out_dummy_plugin.so
-lib/vlc/stream_out/libstream_out_duplicate_plugin.so
-lib/vlc/stream_out/libstream_out_es_plugin.so
-lib/vlc/stream_out/libstream_out_gather_plugin.so
-lib/vlc/stream_out/libstream_out_rtp_plugin.so
-lib/vlc/stream_out/libstream_out_standard_plugin.so
-lib/vlc/video_chroma/libi420_rgb_plugin.so
-lib/vlc/video_chroma/libi420_ymga_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_plugin.so
-lib/vlc/video_filter/libadjust_plugin.so
-lib/vlc/video_filter/libclone_plugin.so
-lib/vlc/video_filter/libcrop_plugin.so
-lib/vlc/video_filter/libdeinterlace_plugin.so
-lib/vlc/video_filter/libdistort_plugin.so
-lib/vlc/video_filter/libinvert_plugin.so
-lib/vlc/video_filter/liblogo_plugin.so
-lib/vlc/video_filter/libmotionblur_plugin.so
-lib/vlc/video_filter/libtransform_plugin.so
-lib/vlc/video_filter/libwall_plugin.so
-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
-share/locale/de/LC_MESSAGES/vlc.mo
-share/locale/en_GB/LC_MESSAGES/vlc.mo
-share/locale/es/LC_MESSAGES/vlc.mo
-share/locale/fr/LC_MESSAGES/vlc.mo
-share/locale/hu/LC_MESSAGES/vlc.mo
-share/locale/it/LC_MESSAGES/vlc.mo
-share/locale/ja/LC_MESSAGES/vlc.mo
-share/locale/nl/LC_MESSAGES/vlc.mo
-share/locale/no/LC_MESSAGES/vlc.mo
-share/locale/pl/LC_MESSAGES/vlc.mo
-share/locale/pt_BR/LC_MESSAGES/vlc.mo
-share/locale/ru/LC_MESSAGES/vlc.mo
-share/locale/sv/LC_MESSAGES/vlc.mo
-share/vlc/familiar-forwardb16x16.xpm
-share/vlc/familiar-openb16x16.xpm
-share/vlc/familiar-pauseb16x16.xpm
-share/vlc/familiar-playb16x16.xpm
-share/vlc/familiar-playlistb16x16.xpm
-share/vlc/familiar-preferencesb16x16.xpm
-share/vlc/familiar-rewindb16x16.xpm
-share/vlc/familiar-stopb16x16.xpm
-share/vlc/gnome-vlc16x16.png
-share/vlc/gnome-vlc32x32.png
-share/vlc/gnome-vlc32x32.xpm
-share/vlc/gnome-vlc48x48.png
-share/vlc/gvlc16x16.png
-share/vlc/gvlc32x32.png
-share/vlc/gvlc32x32.xpm
-share/vlc/gvlc48x48.ico
-share/vlc/gvlc48x48.png
-share/vlc/http/admin/.access
-share/vlc/http/admin/browse.html
-share/vlc/http/admin/dboxfiles.html
-share/vlc/http/admin/index.html
-share/vlc/http/index.html
-share/vlc/http/info.html
-share/vlc/http/style.css
-share/vlc/kvlc16x16.png
-share/vlc/kvlc32x32.png
-share/vlc/kvlc32x32.xpm
-share/vlc/kvlc48x48.png
-share/vlc/pda-forwardb16x16.xpm
-share/vlc/pda-openb16x16.xpm
-share/vlc/pda-pauseb16x16.xpm
-share/vlc/pda-playb16x16.xpm
-share/vlc/pda-playlistb16x16.xpm
-share/vlc/pda-preferencesb16x16.xpm
-share/vlc/pda-rewindb16x16.xpm
-share/vlc/pda-stopb16x16.xpm
-share/vlc/qvlc16x16.png
-share/vlc/qvlc32x32.png
-share/vlc/qvlc32x32.xpm
-share/vlc/qvlc48x48.png
-share/vlc/skins/default/add1.bmp
-share/vlc/skins/default/add2.bmp
-share/vlc/skins/default/add3.bmp
-share/vlc/skins/default/body.bmp
-share/vlc/skins/default/del1.bmp
-share/vlc/skins/default/del2.bmp
-share/vlc/skins/default/del3.bmp
-share/vlc/skins/default/next1.bmp
-share/vlc/skins/default/next2.bmp
-share/vlc/skins/default/next3.bmp
-share/vlc/skins/default/next4.bmp
-share/vlc/skins/default/open1.bmp
-share/vlc/skins/default/open2.bmp
-share/vlc/skins/default/open3.bmp
-share/vlc/skins/default/pause1.bmp
-share/vlc/skins/default/pause2.bmp
-share/vlc/skins/default/pause3.bmp
-share/vlc/skins/default/pause4.bmp
-share/vlc/skins/default/play1.bmp
-share/vlc/skins/default/play2.bmp
-share/vlc/skins/default/play3.bmp
-share/vlc/skins/default/play4.bmp
-share/vlc/skins/default/playlist1.bmp
-share/vlc/skins/default/playlist2.bmp
-share/vlc/skins/default/playlist3.bmp
-share/vlc/skins/default/playlist_body.bmp
-share/vlc/skins/default/prefs1.bmp
-share/vlc/skins/default/prefs2.bmp
-share/vlc/skins/default/prefs3.bmp
-share/vlc/skins/default/prev1.bmp
-share/vlc/skins/default/prev2.bmp
-share/vlc/skins/default/prev3.bmp
-share/vlc/skins/default/prev4.bmp
-share/vlc/skins/default/quit1.bmp
-share/vlc/skins/default/quit2.bmp
-share/vlc/skins/default/quit3.bmp
-share/vlc/skins/default/slider1.bmp
-share/vlc/skins/default/slider2.bmp
-share/vlc/skins/default/stop1.bmp
-share/vlc/skins/default/stop2.bmp
-share/vlc/skins/default/stop3.bmp
-share/vlc/skins/default/stop4.bmp
-share/vlc/skins/default/theme.xml
-share/vlc/ui.rc
-share/vlc/vlc16x16.png
-share/vlc/vlc16x16.xpm
-share/vlc/vlc32x32.png
-share/vlc/vlc32x32.xpm
-share/vlc/vlc48x48.ico
-share/vlc/vlc48x48.png
diff --git a/multimedia/vlc/PLIST.common_end b/multimedia/vlc/PLIST.common_end
deleted file mode 100644
index abf755676cd..00000000000
--- a/multimedia/vlc/PLIST.common_end
+++ /dev/null
@@ -1,26 +0,0 @@
-@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
diff --git a/multimedia/vlc/PLIST.i386 b/multimedia/vlc/PLIST.i386
deleted file mode 100644
index 451926c6dcb..00000000000
--- a/multimedia/vlc/PLIST.i386
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2004/12/02 12:54:26 ben Exp $
-lib/vlc/libi420_rgb_mmx.a
-lib/vlc/libi420_ymga_mmx.a
-lib/vlc/libi420_yuy2_mmx.a
-lib/vlc/libi422_yuy2_mmx.a
-lib/vlc/libmemcpy3dn.a
-lib/vlc/libmemcpymmx.a
-lib/vlc/libmemcpymmxext.a
diff --git a/multimedia/vlc/PLIST.powerpc b/multimedia/vlc/PLIST.powerpc
deleted file mode 100644
index 3e838029776..00000000000
--- a/multimedia/vlc/PLIST.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.powerpc,v 1.2 2004/12/02 12:54:26 ben Exp $
-lib/vlc/libi420_yuy2_altivec.a
-lib/vlc/libmemcpyaltivec.a
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index a256cf62549..e8793532e8b 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/04/28 23:16:28 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/09/26 07:27:19 martti Exp $
-SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
-RMD160 (vlc-0.7.2.tar.bz2) = 05e35e0b9080581cfbc730212fc756cb46bd3257
-Size (vlc-0.7.2.tar.bz2) = 4516835 bytes
-SHA1 (patch-aa) = 03e66c696c8d1491a91b17a1321144a844b94cf1
-SHA1 (patch-ab) = 5f1cb287981d79533aedeb176c0219a815b8bf52
-SHA1 (patch-ac) = aec258582e1d18ccb1efc3ce74e9f949046d61b1
-SHA1 (patch-ad) = e12945776db476e48ce005b6d68f9931ddcbe020
-SHA1 (patch-ae) = 1dcc0466a362fcdf51fbce8869cd1a48d35d3909
+SHA1 (vlc-0.8.5.tar.bz2) = 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b
+RMD160 (vlc-0.8.5.tar.bz2) = d24140a5b4bf771754028090e103bb5c171e4fd8
+Size (vlc-0.8.5.tar.bz2) = 8562996 bytes
+SHA1 (patch-aa) = a12d95fc0d6266969431a3c42d438b3cc11acc79
+SHA1 (patch-ab) = 3a0754638228d664570c7c437b5188195b23c734
+SHA1 (patch-ag) = 4c1b802dc4df1c521398dc9b07794232bb5b21d9
+SHA1 (patch-ah) = 5a355a70b7b39c0a33db7cc37e3944f903686d3f
+SHA1 (patch-ai) = 655df187ab529eb30753531dafbf4b68f7a85785
diff --git a/multimedia/vlc/hacks.mk b/multimedia/vlc/hacks.mk
deleted file mode 100644
index 6d5a2c06d80..00000000000
--- a/multimedia/vlc/hacks.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/08/03 04:18:31 grant Exp $
-
-# the autoconf test for the Darwin linker wrongly succeeds when using
-# icc/Linux because icc ignores unknown flags. override this brain
-# damage.
-.if ${OPSYS} != "Darwin"
-CONFIGURE_ENV+= ac_cv_ld_darwin=no
-.endif
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index 0f7a2f82e45..f9db0037bef 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/04/28 23:16:29 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/09/26 07:27:19 martti Exp $
---- modules/misc/network/ipv4.c.orig 2004-05-16 17:44:52.000000000 +0000
-+++ modules/misc/network/ipv4.c
-@@ -406,7 +406,11 @@ static int OpenUDP( vlc_object_t * p_thi
- if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
- {
- /* set the time-to-live */
-+#ifdef __NetBSD__
-+ unsigned char ttl = p_socket->i_ttl;
-+#else
- int ttl = p_socket->i_ttl;
-+#endif
- if( ttl < 1 )
- {
- ttl = config_GetInt( p_this, "ttl" );
+--- include/vlc_common.h.orig 2006-05-19 19:46:18.000000000 +0000
++++ include/vlc_common.h
+@@ -873,7 +873,7 @@ static inline void _SetQWBE( uint8_t *p,
+ # define vlc_strtoll NULL
+ #endif
+
+-#if defined(SYS_BEOS)
++#if defined(SYS_BEOS) || defined(__DragonFly__)
+ typedef struct {
+ long long quot; /* Quotient. */
+ long long rem; /* Remainder. */
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index 350303921ca..cc10f25e144 100644
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,202 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2005/11/11 23:39:35 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2006/09/26 07:27:19 martti Exp $
---- modules/access/cdda/access.c.orig 2005-11-11 20:18:27.000000000 +0100
-+++ modules/access/cdda/access.c
-@@ -360,36 +360,36 @@ static void InformationCreate( input_thr
- if (p_cdda->i_cddb_enabled) {
-
- dbg_print( INPUT_DBG_META, "field %s: %s\n", "Title",
-- p_cdda->cddb.disc->title );
-+ cddb_disc_get_title(p_cdda->cddb.disc) );
- input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Title"),
-- "%s", p_cdda->cddb.disc->title );
-+ "%s", cddb_disc_get_title(p_cdda->cddb.disc));
-
- dbg_print( INPUT_DBG_META, "field %s: %s\n", "Artist",
-- p_cdda->cddb.disc->artist );
-+ cddb_disc_get_artist(p_cdda->cddb.disc));
- input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Artist"),
-- "%s", p_cdda->cddb.disc->artist );
-+ "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
-
- dbg_print( INPUT_DBG_META, "field %s: %s\n", "Genre",
-- p_cdda->cddb.disc->genre );
-+ cddb_disc_get_genre(p_cdda->cddb.disc));
- input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Genre"),
-- "%s", p_cdda->cddb.disc->genre );
-+ "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
-
- dbg_print( INPUT_DBG_META, "field %s: %s\n", "Extended Data",
-- p_cdda->cddb.disc->ext_data );
-+ cddb_disc_get_ext_data(p_cdda->cddb.disc));
- input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Extended Data"),
-- "%s", p_cdda->cddb.disc->ext_data );
-+ "%s", cddb_disc_get_ext_data(p_cdda->cddb.disc));
-
-- if (p_cdda->cddb.disc->year != 0)
-+ if (cddb_disc_get_year(p_cdda->cddb.disc))
- input_Control( p_input, INPUT_ADD_INFO, _("General"),
-- _("Year"), "%d", p_cdda->cddb.disc->year );
-- if ( p_cdda->cddb.disc->discid )
-+ _("Year"), "%d", cddb_disc_get_year(p_cdda->cddb.disc));
-+ if ( cddb_disc_get_discid(p_cdda->cddb.disc))
- input_Control( p_input, INPUT_ADD_INFO, _("General"),
-- _("CDDB Disc ID"), "%x", p_cdda->cddb.disc->discid );
-+ _("CDDB Disc ID"), "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
-
-- if ( p_cdda->cddb.disc->category != CDDB_CAT_INVALID )
-+ if ( cddb_disc_get_category(p_cdda->cddb.disc) != CDDB_CAT_INVALID )
- input_Control( p_input, INPUT_ADD_INFO, _("General"),
- _("CDDB Disc Category"), "%s",
-- CDDB_CATEGORY[p_cdda->cddb.disc->category] );
-+ CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)] );
- }
-
- #endif /*HAVE_LIBCDDB*/
-@@ -420,17 +420,17 @@ static void InformationCreate( input_thr
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track);
- if (t != NULL) {
-- if ( t->artist != NULL && strlen(t->artist) ) {
-+ if ( cddb_track_get_artist(t) != NULL && strlen(cddb_track_get_artist(t)) ) {
- input_Control( p_input, INPUT_ADD_INFO, track_str,
-- _("Artist"), "%s", t->artist );
-+ _("Artist"), "%s", cddb_track_get_artist(t));
- }
-- if ( t->title != NULL && strlen(t->title) ) {
-+ if ( cddb_track_get_title(t) != NULL && strlen(cddb_track_get_title(t)) ) {
- input_Control( p_input, INPUT_ADD_INFO, track_str,
-- _("Title"), "%s", t->title );
-+ _("Title"), "%s", cddb_track_get_title(t));
- }
-- if ( t->ext_data != NULL && strlen(t->ext_data) ) {
-+ if ( cddb_track_get_ext_data(t) != NULL && cddb_track_get_ext_data(t) ) {
- input_Control( p_input, INPUT_ADD_INFO, track_str,
-- _("Extended Data"), "%s", t->ext_data );
-+ _("Extended Data"), "%s", cddb_track_get_ext_data(t));
- }
- }
- }
-@@ -505,13 +505,13 @@ GetCDDBInfo( const input_thread_t *p_inp
-
- for(i = 1; i <= p_cdda->i_nb_tracks; i++) {
- cddb_track_t *t = cddb_track_new();
-- t->frame_offset = cdio_get_track_lba(cdio, i);
-+ cddb_track_set_frame_offset(t, cdio_get_track_lba(cdio, i));
- cddb_disc_add_track(p_cdda->cddb.disc, t);
- }
-
-- p_cdda->cddb.disc->length =
-+ cddb_disc_set_length(p_cdda->cddb.disc,
- cdio_get_track_lba(cdio, CDIO_CDROM_LEADOUT_TRACK)
-- / CDIO_CD_FRAMES_PER_SEC;
-+ / CDIO_CD_FRAMES_PER_SEC);
-
- if (!cddb_disc_calc_discid(p_cdda->cddb.disc)) {
- msg_Err( p_input, "CDDB disc calc failed" );
-@@ -618,50 +618,50 @@ CDDAFormatStr(const input_thread_t *p_in
- #ifdef HAVE_LIBCDDB
- case 'a':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_str_info(p_cdda->cddb.disc->artist);
-+ add_format_str_info(cddb_disc_get_artist(p_cdda->cddb.disc));
- break;
- case 'A':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_str_info(p_cdda->cddb.disc->title);
-+ add_format_str_info(cddb_disc_get_title(p_cdda->cddb.disc));
- break;
- case 'C':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_str_info(CDDB_CATEGORY[p_cdda->cddb.disc->category]);
-+ add_format_str_info(CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
- break;
- case 'G':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_str_info(p_cdda->cddb.disc->genre);
-+ add_format_str_info(cddb_disc_get_genre(p_cdda->cddb.disc));
- break;
- case 'I':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_num_info(p_cdda->cddb.disc->discid, "%x");
-+ add_format_num_info(cddb_disc_get_discid(p_cdda->cddb.disc), "%x");
- break;
- case 'Y':
- if (!p_cdda->i_cddb_enabled) goto not_special;
-- add_format_num_info(p_cdda->cddb.disc->year, "%5d");
-+ add_format_num_info(cddb_disc_get_year(p_cdda->cddb.disc), "%5d");
- break;
- case 't':
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
-- if (t != NULL && t->title != NULL)
-- add_format_str_info(t->title);
-+ if (t != NULL && cddb_track_get_title(t) != NULL)
-+ add_format_str_info(cddb_track_get_title(t));
- } else goto not_special;
- break;
- case 'p':
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
-- if (t != NULL && t->artist != NULL)
-- add_format_str_info(t->artist);
-+ if (t != NULL && cddb_track_get_artist(t) != NULL)
-+ add_format_str_info(cddb_track_get_artist(t));
- } else goto not_special;
- break;
- case 'e':
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
-- if (t != NULL && t->ext_data != NULL)
-- add_format_str_info(t->ext_data);
-+ if (t != NULL && cddb_track_get_ext_data(t) != NULL)
-+ add_format_str_info(cddb_track_get_ext_data(t));
- } else goto not_special;
- break;
- #endif
-@@ -762,31 +762,31 @@ CDDACreatePlayListItem(const input_threa
- const char *psz_general_cat = _("General");
-
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Album"),
-- "%s", p_cdda->cddb.disc->title);
-+ "%s", cddb_disc_get_title(p_cdda->cddb.disc));
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Disc Artist(s)"),
-- "%s", p_cdda->cddb.disc->artist);
-+ "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
- playlist_ItemAddInfo( p_item, psz_general_cat,
- _("CDDB Disc Category"),
-- "%s", CDDB_CATEGORY[p_cdda->cddb.disc->category]);
-+ "%s", CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Genre"),
-- "%s", p_cdda->cddb.disc->genre);
-- if ( p_cdda->cddb.disc->discid ) {
-+ "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
-+ if ( cddb_disc_get_discid(p_cdda->cddb.disc) ) {
- playlist_ItemAddInfo( p_item, psz_general_cat, _("CDDB Disc ID"),
-- "%x", p_cdda->cddb.disc->discid );
-+ "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
- }
-- if (p_cdda->cddb.disc->year != 0) {
-+ if (cddb_disc_get_year(p_cdda->cddb.disc) != 0) {
- playlist_ItemAddInfo( p_item, psz_general_cat,
-- _("Year"), "%5d", p_cdda->cddb.disc->year );
-+ _("Year"), "%5d", cddb_disc_get_year(p_cdda->cddb.disc) );
- }
-
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
-- if (t != NULL && t->artist != NULL) {
-+ if (t != NULL && cddb_track_get_artist(t) != NULL) {
- playlist_ItemAddInfo( p_item, psz_general_cat,
-- _("Track Artist"), "%s", t->artist );
-+ _("Track Artist"), "%s", cddb_track_get_artist(t));
- playlist_ItemAddInfo( p_item , psz_general_cat,
-- _("Track Title"), "%s", t->title );
-+ _("Track Title"), "%s", cddb_track_get_title(t));
- }
- }
-
+--- src/extras/libc.c.orig 2006-05-19 20:06:19.000000000 +0000
++++ src/extras/libc.c
+@@ -346,7 +346,7 @@ int64_t vlc_atoll( const char *nptr )
+ /*****************************************************************************
+ * lldiv: returns quotient and remainder
+ *****************************************************************************/
+-#if defined(SYS_BEOS)
++#if defined(SYS_BEOS) || defined(__DragonFly__)
+ lldiv_t vlc_lldiv( long long numer, long long denom )
+ {
+ lldiv_t d;
diff --git a/multimedia/vlc/patches/patch-ac b/multimedia/vlc/patches/patch-ac
deleted file mode 100644
index 4e5ff63bef5..00000000000
--- a/multimedia/vlc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/open.cpp.orig 2004-05-21 11:24:58.000000000 +0000
-+++ modules/gui/wxwindows/open.cpp
-@@ -382,7 +382,7 @@ OpenDialog::OpenDialog( intf_thread_t *_
- wxU(_("Open:")) );
- mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
- wxPoint(20,25), wxSize(120, -1),
-- 0, NULL );
-+ 0, (const wxString*)NULL );
- mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
- "the full MRL you want to open.\n""Alternatively, the field will be "
- "filled automatically when you use the controls below.")) );
-@@ -563,7 +563,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow
- wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
-
- file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
-- wxPoint(20,25), wxSize(200, -1), 0, NULL );
-+ wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
- wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
- wxU(_("Browse...")) );
- file_sizer->Add( file_combo, 1, wxALL, 5 );
diff --git a/multimedia/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad
deleted file mode 100644
index 67174651cdd..00000000000
--- a/multimedia/vlc/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/streamout.cpp.orig 2004-05-16 11:42:29.000000000 +0000
-+++ modules/gui/wxwindows/streamout.cpp
-@@ -166,7 +166,7 @@ SoutDialog::SoutDialog( intf_thread_t *_
- wxStaticText *mrl_label = new wxStaticText( panel, -1,
- wxU(_("Destination Target:")));
- mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
-- wxPoint(20,25), wxSize(120, -1), 0, NULL );
-+ wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL );
- mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
- "the full MRL you want to open.\n""Alternatively, the field will be "
- "filled automatically when you use the controls below")) );
-@@ -447,7 +447,7 @@ wxPanel *SoutDialog::AccessPanel( wxWind
- subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
- label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
- file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
-- wxPoint(20,25), wxSize(200, -1), 0, NULL );
-+ wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
- wxButton *browse_button = new wxButton( access_subpanels[1],
- FileBrowse_Event, wxU(_("Browse...")) );
- subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
diff --git a/multimedia/vlc/patches/patch-ae b/multimedia/vlc/patches/patch-ae
deleted file mode 100644
index e1ceafd4916..00000000000
--- a/multimedia/vlc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/subtitles.cpp.orig 2004-03-05 19:25:18.000000000 +0000
-+++ modules/gui/wxwindows/subtitles.cpp
-@@ -85,7 +85,7 @@ SubsFileDialog::SubsFileDialog( intf_thr
- char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
- if( !psz_subsfile ) psz_subsfile = strdup("");
- file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
-- wxPoint(20,25), wxSize(300, -1), 0, NULL );
-+ wxPoint(20,25), wxSize(300, -1), 0, (const wxString *)NULL );
- if( psz_subsfile ) free( psz_subsfile );
- wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
- wxU(_("Browse...")) );
diff --git a/multimedia/vlc/patches/patch-ag b/multimedia/vlc/patches/patch-ag
new file mode 100644
index 00000000000..81d947050da
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- ./modules/gui/wxwidgets/menus.cpp.orig 2006-05-04 14:22:54.000000000 +0200
++++ ./modules/gui/wxwidgets/menus.cpp
+@@ -1013,7 +1013,6 @@ void MenuEvtHandler::OnMenuEvent( wxComm
+ p_menuitemext->i_object_id );
+ if( p_object == NULL ) return;
+
+- wxMutexGuiLeave(); // We don't want deadlocks
+ var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
+ //wxMutexGuiEnter();
+
diff --git a/multimedia/vlc/patches/patch-ah b/multimedia/vlc/patches/patch-ah
new file mode 100644
index 00000000000..edac89481bd
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- src/misc/charset.c.orig 2006-05-06 17:52:13.000000000 +0200
++++ src/misc/charset.c
+@@ -37,10 +37,9 @@
+ #if !defined WIN32
+ # if HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+-# else
+-# if HAVE_SETLOCALE
+-# include <locale.h>
+-# endif
++# endif
++# if HAVE_SETLOCALE
++# include <locale.h>
+ # endif
+ #elif defined WIN32
+ # include <windows.h>
diff --git a/multimedia/vlc/patches/patch-ai b/multimedia/vlc/patches/patch-ai
new file mode 100644
index 00000000000..dc52decfc38
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ai
@@ -0,0 +1,202 @@
+$NetBSD: patch-ai,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- configure.orig 2006-05-06 15:54:17.000000000 +0000
++++ configure
+@@ -30035,13 +30035,13 @@ fi
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+ THREAD_LIB=error
+ if test "${THREAD_LIB}" = "error"; then
+- echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30093,7 +30093,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+ if test $ac_cv_lib_pthread_main = yes; then
+- THREAD_LIB="-lpthread"
++ THREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+
+ fi
+@@ -36628,7 +36628,7 @@ fi;
+ test "${enable_debug}" != "yes" && enable_debug="no"
+
+
+-if test "x${enable_debug}" == "xno"; then
++if test "x${enable_debug}" = "xno"; then
+ cat >>confdefs.h <<\_ACEOF
+ #define NDEBUG 1
+ _ACEOF
+@@ -37311,7 +37311,7 @@ echo "${ECHO_T}yes" >&6
+
+
+ for element in access_dv; do
+- eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -37563,7 +37563,7 @@ echo $ECHO_N "checking for avc1394 heade
+ echo "${ECHO_T}yes" >&6
+
+ for element in access_dv; do
+- eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -37727,7 +37727,7 @@ if test `eval echo '${'$as_ac_Header'}'`
+ _ACEOF
+
+ for element in access_dv; do
+- eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -37766,7 +37766,7 @@ echo "$as_me: error: cannot cd to ${real
+ echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6
+
+ for element in access_dv; do
+- eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -43126,14 +43126,14 @@ echo "${ECHO_T}no" >&6
+ echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+- if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
++ if ! test -f "${real_ffmpeg_tree}/libavcodec.a"; then
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
+-echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
++echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+- if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
++ if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec.a"; then
+ if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
+
+ for element in ffmpeg; do
+@@ -43144,13 +43144,13 @@ echo "$as_me: error: cannot find ${real_
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
+-echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
++ { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
++echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+- echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5
+-echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6
++ echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec.a" >&5
++echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec.a" >&6
+
+ if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
+ if test "${with_ffmpeg_zlib}" != "yes"; then
+@@ -43318,7 +43318,7 @@ fi
+
+
+ for element in ffmpeg; do
+- eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -55864,7 +55864,7 @@ fi
+
+
+ for element in directfb; do
+- eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -56043,7 +56043,7 @@ if test "${with_directfb+set}" = set; th
+
+
+ for element in directfb; do
+- eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -58056,7 +58056,7 @@ echo $ECHO_N "checking for XML parser to
+ LIBS_save="$LIBS"
+ LIBS_cclink="no"
+ for l in "`xml2-config --libs`" -lexpat -lxerces-c; do
+- LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l"
++ LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $l"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -58120,7 +58120,7 @@ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ done
+ LIBS="${LIBS_save}"
+- if test "${LIBS_cclink}" == "no"; then
++ if test "${LIBS_cclink}" = "no"; then
+ { { echo "$as_me:$LINENO: error: cannot find XML parser for CyberLink
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot find XML parser for CyberLink
+@@ -58132,7 +58132,7 @@ fi
+ echo "${ECHO_T}${LIBS_cclink}" >&6
+
+ for element in upnp_cc; do
+- eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -58181,7 +58181,7 @@ if test "${ac_cv_lib_upnp_UpnpInit+set}"
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lupnp -lpthread $LIBS"
++LIBS="-lupnp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -58244,7 +58244,7 @@ else
+ has_upnp="no"
+ fi
+
+- if test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"; then
++ if test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"; then
+  
+ { { echo "$as_me:$LINENO: error: cannot find Intel UPnP SDK (libupnp)" >&5
+ echo "$as_me: error: cannot find Intel UPnP SDK (libupnp)" >&2;}
+@@ -58252,7 +58252,7 @@ echo "$as_me: error: cannot find Intel U
+
+ fi
+
+- if test "${has_upnp}" == "yes"; then
++ if test "${has_upnp}" = "yes"; then
+
+
+ for element in upnp_intel; do
+@@ -58271,7 +58271,7 @@ else
+ fi
+
+
+-if test "${has_upnp}" == "yes"; then
++if test "${has_upnp}" = "yes"; then
+
+
+ PLUGINS="${PLUGINS} upnp_intel"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 02:36:04 +0000