a) Update to 0.6.0

b) Maintainer timeout:
   Oldest PR was submitted at Tue Apr 08 08:40:14 PDT 2003

PR:	50728, 51590, 53935
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (#50728, #53935)
		Gleb Smirnoff <glebius@cell.sick.ru> (#51590)

6 files changed, 310 insertions, 69 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index a7e45b938014..c56a096a903d 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -6,24 +6,49 @@
 #
 
 PORTNAME=	vlc
-PORTVERSION=	0.4.4
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
-		ftp://ftp.Awfulhak.org/pub/vlc/ \
-		http://people.FreeBSD.org/~brian/vlc/
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
 MAINTAINER=	brian@FreeBSD.org
-COMMENT=	An X11 MPEG2 client/server solution
+COMMENT=	An X11 video streaming client/server solution
 
 LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
-		dvdread.3:${PORTSDIR}/multimedia/libdvdread
+		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
+		mad.1:${PORTSDIR}/audio/mad \
+		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
+		a52.0:${PORTSDIR}/audio/liba52 \
+		intl.4:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		ogg.4:${PORTSDIR}/audio/libogg \
+		FLAC.5:${PORTSDIR}/audio/flac \
+		faad.0:${PORTSDIR}/audio/faad \
+		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
+		slp.1:${PORTSDIR}/net/openslp
 
+# After libmpeg2 release 0.3.2
+#		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
+
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}"
 CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--with-dvdread=${LOCALBASE} \
-		--includedir="${LOCALBASE}/include" \
-		--libdir="${LOCALBASE}/lib"
+		--with-mad=${LOCALBASE} \
+		--with-faad=${LOCALBASE} \
+		--disable-dvbpsi \
+		--with-a52=${LOCALBASE} \
+		--enable-ffmpeg \
+		--with-ffmpeg=${LOCALBASE} \
+		--disable-libmpeg2 \
+		--without-libintl-prefix \
+		--without-libiconv-prefix
+
+# dirty
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 34a4472eb0b9..a9274abdcee5 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1 +1 @@
-MD5 (vlc-0.4.4.tar.gz) = c65409d36e8dce884d9195c2763bcf20
+MD5 (vlc-0.6.0.tar.gz) = a5e2f50ce6025fb8ff9e197b4ab5e12a
diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
new file mode 100644
index 000000000000..54bebea7aed0
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Jun 30 18:06:22 2003
++++ configure	Mon Jun 30 18:07:02 2003
+@@ -14017,7 +14017,7 @@
+ fi
+ 
+ 
+-#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
++BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
+ PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
+ PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
+ PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
diff --git a/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c b/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c
new file mode 100644
index 000000000000..359baa7bf977
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c
@@ -0,0 +1,11 @@
+--- modules/codec/mpeg_video/parser.c.orig	Mon Jun 30 18:15:14 2003
++++ modules/codec/mpeg_video/parser.c	Mon Jun 30 18:16:37 2003
+@@ -143,7 +143,7 @@
+     {
+         free( p_vpar );
+         return( -1 );
+-    )
++    }
+ 
+     /*
+      * Main loop - it is not executed if an error occured during
diff --git a/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp b/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp
new file mode 100644
index 000000000000..4f9da4eca5a5
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp
@@ -0,0 +1,14 @@
+--- modules/gui/wxwindows/menus.cpp.orig	Mon Jun 30 15:22:03 2003
++++ modules/gui/wxwindows/menus.cpp	Mon Jun 30 15:24:40 2003
+@@ -516,9 +516,8 @@
+           menuitem =
+               new wxMenuItemExt( menu, ++i_item_id,
+                                  text_list.p_list->p_values[i].psz_string ?
+-                                 wxU(text_list.p_list->p_values[i].psz_string):
+-                                 wxString::Format(wxT("%d"),
+-                                 val_list.p_list->p_values[i].i_int),
++                                 (wxString)wxU(text_list.p_list->p_values[i].psz_string):
++                                 (wxString)wxString::Format(wxT("%d"), val_list.p_list->p_values[i].i_int),
+                                  wxT(""), wxITEM_RADIO, strdup(psz_var),
+                                  p_object->i_object_id,
+                                  val_list.p_list->p_values[i], i_type );
diff --git a/multimedia/vlc-devel/pkg-plist b/multimedia/vlc-devel/pkg-plist
index 490388592ce1..14b81288e62e 100644
--- a/multimedia/vlc-devel/pkg-plist
+++ b/multimedia/vlc-devel/pkg-plist
@@ -1,67 +1,247 @@
-bin/vlc
+bin/i386-portbld-freebsd4.8-vlc-config
+bin/i386-portbld-freebsd4.8-vlc
 bin/gvlc
-lib/videolan/vlc/dummy.so 
-lib/videolan/vlc/null.so 
-lib/videolan/vlc/rc.so 
-lib/videolan/vlc/logger.so 
-lib/videolan/vlc/mpeg_es.so 
-lib/videolan/vlc/mpeg_ps.so 
-lib/videolan/vlc/mpeg_ts.so 
-lib/videolan/vlc/mpeg_audio.so 
-lib/videolan/vlc/file.so 
-lib/videolan/vlc/udp.so 
-lib/videolan/vlc/http.so 
-lib/videolan/vlc/ipv4.so 
-lib/videolan/vlc/memcpy.so 
-lib/videolan/vlc/lpcm_adec.so 
-lib/videolan/vlc/ac3_spdif.so 
-lib/videolan/vlc/spudec.so 
-lib/videolan/vlc/filter_deinterlace.so 
-lib/videolan/vlc/filter_invert.so 
-lib/videolan/vlc/filter_wall.so 
-lib/videolan/vlc/filter_transform.so 
-lib/videolan/vlc/filter_distort.so 
-lib/videolan/vlc/filter_clone.so 
-lib/videolan/vlc/filter_crop.so 
-lib/videolan/vlc/fx_scope.so 
-lib/videolan/vlc/dvd.so 
-lib/videolan/vlc/dvdread.so 
-lib/videolan/vlc/vcd.so 
-lib/videolan/vlc/ipv6.so 
-lib/videolan/vlc/avi.so 
-lib/videolan/vlc/x11.so 
-lib/videolan/vlc/dsp.so
-lib/videolan/vlc/gtk.so 
-share/videolan/default8x16.psf
-share/videolan/default8x9.psf
-share/videolan/gnome-vlc16x16.png
-share/videolan/gnome-vlc32x32.png
-share/videolan/gnome-vlc48x48.png
-share/videolan/gvlc16x16.png
-share/videolan/gvlc32x32.png
-share/videolan/gvlc48x48.png
-share/videolan/kvlc16x16.png
-share/videolan/kvlc32x32.png
-share/videolan/kvlc48x48.png
-share/videolan/qvlc16x16.png
-share/videolan/qvlc32x32.png
-share/videolan/qvlc48x48.png
-share/videolan/vlc16x16.png
-share/videolan/vlc32x32.png
-share/videolan/vlc48x48.png
-share/videolan/gnome-vlc32x32.xpm
-share/videolan/gvlc32x32.xpm
-share/videolan/kvlc32x32.xpm
-share/videolan/qvlc32x32.xpm
-share/videolan/vlc32x32.xpm
+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/charset.alias
+lib/libvlc.a
+lib/vlc/libidct.a
+lib/vlc/libidctclassic.a
+lib/vlc/libmotion.a
+lib/vlc/libmpeg_video_old.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_udp_plugin.so
+lib/vlc/access/libcdda_plugin.so
+lib/vlc/access/libdvd_plugin.so
+lib/vlc/access/libdvdread_plugin.so
+lib/vlc/access/libvcd_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/libdts_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/control/libgestures_plugin.so
+lib/vlc/control/libhttp_plugin.so
+lib/vlc/control/librc_plugin.so
+lib/vlc/demux/liba52sys_plugin.so
+lib/vlc/demux/libaac_plugin.so
+lib/vlc/demux/libasf_plugin.so
+lib/vlc/demux/libau_plugin.so
+lib/vlc/demux/libaudio_plugin.so
+lib/vlc/demux/libavi_plugin.so
+lib/vlc/demux/libdemuxdump_plugin.so
+lib/vlc/demux/libdemuxsub_plugin.so
+lib/vlc/demux/libes_plugin.so
+lib/vlc/demux/libid3_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/libps_plugin.so
+lib/vlc/demux/librawdv_plugin.so
+lib/vlc/demux/libts_plugin.so
+lib/vlc/demux/libwav_plugin.so
+lib/vlc/gui/libgtk_plugin.so
+lib/vlc/gui/libwxwindows_plugin.so
+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/misc/libdummy_plugin.so
+lib/vlc/misc/libgtk_main_plugin.so
+lib/vlc/misc/libhttpd_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_avi_plugin.so
+lib/vlc/mux/libmux_dummy_plugin.so
+lib/vlc/mux/libmux_ps_plugin.so
+lib/vlc/mux/libmux_ts_plugin.so
+lib/vlc/packetizer/libpacketizer_a52_plugin.so
+lib/vlc/packetizer/libpacketizer_copy_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
+lib/vlc/packetizer/libpacketizer_mpegaudio_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_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/libmotionblur_plugin.so
+lib/vlc/video_filter/libosdtext_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
 share/locale/de/LC_MESSAGES/vlc.mo
 share/locale/en_GB/LC_MESSAGES/vlc.mo
 share/locale/fr/LC_MESSAGES/vlc.mo
+share/locale/it/LC_MESSAGES/vlc.mo
 share/locale/ja/LC_MESSAGES/vlc.mo
-share/locale/no/LC_MESSAGES/vlc.mo
-share/locale/ru/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
-@dirrm lib/videolan/vlc
-@dirrm lib/videolan
-@dirrm share/videolan
+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-preferencesb16x16.xpm
+share/vlc/familiar-rewindb16x16.xpm
+share/vlc/familiar-stopb16x16.xpm
+share/vlc/font-eutopiabold21.rle
+share/vlc/font-eutopiabold36.rle
+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/kvlc16x16.png
+share/vlc/kvlc32x32.png
+share/vlc/kvlc32x32.xpm
+share/vlc/kvlc48x48.png
+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
+@dirrm share/vlc/skins/default
+@dirrm share/vlc/skins
+@dirrm share/vlc
+@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
+@unexec rmdir %D/lib/vlc/visualization 2>/dev/null || true
+@unexec rmdir %D/lib/vlc/encoder 2>/dev/null || true
+@dirrm lib/vlc