4 files changed, 401 insertions, 434 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 36719e22d5c0..c0e6896b66f4 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,242 +3,22 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.2 2005/11/29 17:44:29 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.6 2006/05/07 22:25:24 ahze Exp $
 #
-# NOTES about VLC Knobs:
-# Below you will see a number of knobs, if it starts with WITHOUT_ it is
-# enabled by default, if it starts with WITH_ it is disabled by default
-# and will be autodetected to enable
-#
-# If you define for example WITH_FAAD and WITHOUT_FAAD
-# the WITHOUT_ will always over ride the WITH_.
-#
-# Interface Knobs:
-#
-# WITH_CORBA
-#  Enable a Corba interface via orbit2
-#
-# WITH_NCURSES=yes
-#  Ncurses (console) interface
-#
-# WITH_SKINS
-#  This Interface supports a skinned gtk2.0 interface
-#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
-#
-# WITHOUT_WXGTK=yes
-#  WxWindows/Gtk 2.x Interface
-#  This is the default and most supported
-#  x11 interface
-#
-# WITH_WXGTK_VER=[2.4|2.6]
-#  Choose a WxGTK version you want to use.
-#  Defaults to 26
-#
-# Audio Knobs:
-#
-# WITH_ARTS=yes
-#  Arts Support
-#
-# WITH_DAAP=yes
-#  Enable libopendaap to connect to iTunes(R) music shares.
-#
-# WITHOUT_DTS=yes
-#  DTS decoder Support
-#  useful for many dvds
-#
-# WITH_ESOUND=yes
-#  Esound Support
-#
-# WITH_FAAC=yes
-#  Faac audio encoder (mp4/aac) Support
-#  ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
-#
-# WITH_FAAD=yes
-#  Faad audio decoder (mp4/aac) Support
-#
-# WITHOUT_FLAC=yes
-#  Flac Support
-#
-# WITHOUT_LAME=yes
-#  Mp3 encoder Support
-#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
-#
-# WITHOUT_A52=yes
-#  liba52 audio Support
-#
-# WITH_REALAUDIO
-#  Real audio(R) support
-#
-# WITH_SHOUT
-#  Libshout2 support
-#
-# WITH_TREMOR
-#  Interger-only Ogg Vorbis decoder
-#   !!experimental!!
-#
-# WITHOUT_MAD=yes
-#  Mad mp3 audio decoder Support
-#
-# WITHOUT_OGG=yes
-#  Ogg audio decoder Support
-#
-# WITH_SPEEX=yes
-#  Speex voice codec Support
-#
-# WITH_TWOLAME=yes
-#  Twolame Mpeg layer 2 audio Support
-#
-# WITHOUT_VORBIS=yes
-#  Vorbis Support
-#
-# Graphics Knobs:
-#
-# WITH_AALIB=yes
-#  Console Graphics Support
-#
-# WITH_CACA=yes
-#  Console Graphics Support (implies WITH_AALIB)
-#
-# WITH_DV=yes
-#  Digital video input
-#
-# WITH_FRIBIDI=yes
-#
-# WITH_GGI=yes
-#
-# WITH_SDL=yes
-#  SDL video output
-#
-# WITH_SVG=yes
-#
-# WITH_SVGALIB=yes
-#  SVGAlib video output
-#
-# WITH_XOSD=yes
-#
-# Multimedia Knobs:
-#
-# WITH_DIRAC
-#  Enable dirac general-purpose video codec
-#
-# WITH_X264
-#  Enable H.264/AVC Video Support
-#
-# WITHOUT_MATROSKA=yes
-#  Matroska Container Format Support
-#
-# WITHOUT_MPEG2=yes
-#  Mpeg-2 A/V Decoder Support
-#
-# WITH_THEORA=yes
-#  Video codec for OGG/Vorbis Support
-#
-# WITH_TRANSCODE=yes
-#  Disable transcode of multimedia via transcode (multimedia/transcode).
-#  This option allows you to convert a media file, dvd, A/V stream, etc
-#  in to another format. This also allows you to transcode multimedia
-#  on-the-fly and stream to a network and/or local playback.
-#
-# Streaming Knobs:
-#
-# WITHOUT_HTTPD=yes
-#  Web interface to control streaming media
-#
-# WITHOUT_LIVEMEDIA=yes
-#  Support for rstp/rtp/sdp protocols
-#  Only versions 2004.11.11 and higher are supported.
-#
-# WITHOUT_STREAM_PLUGINS=yes
-#  Disable build and install of Streaming plugins
-#
-# WITH_WIN32_CODECS=yes
-#  Support for win32 multimedia DLL's
-#
-# Other Knobs:
-#
-# WITH_AVAHI=yes
-#  Avahi (Rendezvous/Bonjour (R) ) networking
-#
-# WITH_DEBUG=yes
-#  Enable debuging support
-#
-# WITHOUT_CDROM=yes
-#  Disable cddb and vcd support
-#   and other cdrom support
-#
-# WITHOUT_CDPARANOIA=yes
-#  Disable Cdparanoia support
-#
-# WITHOUT_DVBPSI=yes
-#  TS MUX and DEMUX support
-#
-# WITHOUT_DVDNAV=yes
-#  Disable DVD (dvd menus) support
-#
-# WITH_DVDREAD=yes
-#  Enable Regular DVD support (non-menu)
-#
-# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
-# WITH_VLC_MOZILLA_PLUGIN= yes
-#  Enable A mozilla plugin for VLC
-#  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
-#  for more info on using this plugin.
-#   defaults to www/mozilla
-#
-#  NOTE: The www/mplayer-plugin is much more complete.
-#
-# WITH_OPENGL=yes
-#  Enable OpenGL visual plugin (not playback, play back is default with X11)
-#
-# WITH_SAMBA=yes
-#  Enable SAMBA Access module
-#
-# WITH_SSL=yes
-#  Enable TLS/SSL Support for web (httpd) interface
-#
-# WITHOUT_SLP=yes
-#  Disable SLP service discovery support
-#  * recommended if you want to stream media
-#
-# WITH_OPTIMIZED_CFLAGS=yes
-#  Compile with -O2 -ffast-math -fomit-frame-pointer
-#
-# WITH_DVD_DEVICE=/dev/somedevice
-#  default 5.x and above: /dev/acd0
-#  default 4.x and below: /dev/acd0c
-#  This option changes the default dvd device
-#
-# WITH_CDROM_DEVICE=/dev/somedevice
-#  default 5.x and above: /dev/acd0
-#  default 4.x and below: /dev/acd0c
-#  This option changes the default cdrom device
-#
-# WITHOUT_NLS=yes
-#  Disable Languarge Support
-#
-# WITHOUT_STREAM_PLUGINS=yes
-#  Disable ALL streaming plugins.
-#
-# WITH_VLC_DEFAULT_FONT=/path/to/font
-#  default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
-#  This option lets you change the default font for subtitles
-#
-# NOPORTDOCS=yes
-#  Do not install Vlc's Documents
+# *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.5.20060423-test4
-PORTREVISION=	1
+DISTVERSION=	0.8.6.20060507
+PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
-MASTER_SITES=	http://download.videolan.org/pub/videolan/testing/vlc-0.8.5-test4/
-#		http://nightlies.videolan.org/build/source/
+MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 #		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
 #		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
 #		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${DISTVERSION:S/.20060423//}
+DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.6.//}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
@@ -247,11 +27,11 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fo
 
 CONFLICTS=	vlc-[0-9]*
 
-#WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.5-test1
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.6-svn
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
@@ -347,7 +127,7 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 .endif
 .endif
 
-.if ${HAVE_GNOME:Mgnomevfs2} || defined(WITH_GNOMEVFS)
+.if !defined(WITHOUT_GNOMEVFS)
 USE_GNOME+=	gnomevfs2
 CONFIGURE_ARGS+=	--enable-gnomevfs
 .else
@@ -395,7 +175,7 @@ CONFIGURE_ARGS+=	--enable-arts
 CONFIGURE_ARGS+=	--disable-arts
 .endif
 
-.if (defined(WITH_AVAHI) || exists(${LOCALBASE}/lib/libavahi-client.a)) && !defi
+.if !defined(WITHOUT_AVAHI)
 LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi
 CONFIGURE_ARGS+=	--enable-bonjour
 .else
@@ -473,7 +253,7 @@ CONFIGURE_ARGS+=--enable-faad
 CONFIGURE_ARGS+=--disable-faad
 .endif
 
-.if !defined(WITHOUT_FLAC)
+.if (defined(WITH_FLAC) || exists(${LOCALBASE}/lib/libFLAC.a)) && !defined(WITHOUT_FLAC)
 LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
@@ -502,7 +282,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include/dirac
 CONFIGURE_ARGS+=--disable-dirac
 .endif
 
-.if (defined(WITH_H264) || defined(WITH_X264) || exists(${LOCALBASE}/lib/libx264.a)) && !defined(WITHOUT_X264)
+.if !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
 LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
 .else
@@ -521,7 +301,7 @@ CONFIGURE_ARGS+=--enable-caca
 CONFIGURE_ARGS+=--disable-caca
 .endif
 
-.if (defined(WITH_DAAP) || exists(${LOCALBASE}/lib/libopendaap.a)) && !defined(WITHOUT_DAAP)
+.if !defined(WITHOUT_DAAP)
 LIB_DEPENDS+=	opendaap.0:${PORTSDIR}/devel/libopendaap
 CONFIGURE_ARGS+=--enable-daap
 .else
@@ -542,6 +322,13 @@ CONFIGURE_ARGS+=--enable-dv
 CONFIGURE_ARGS+=--disable-dv
 .endif
 
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=	--enable-hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
+.endif
+
 .if defined(WITHOUT_HTTPD)
 CONFIGURE_ARGS+=--disable-httpd
 .endif
@@ -593,7 +380,8 @@ CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
 .if defined(WITH_REALAUDIO)
-CONFIGURE_ARGS+=	--enable-real
+CONFIGURE_ARGS+=	--enable-real \
+			--enable-realrtsp
 .endif
 
 .if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
@@ -608,7 +396,7 @@ CONFIGURE_ARGS+=--enable-theora
 CONFIGURE_ARGS+=--disable-theora
 .endif
 
-.if !defined(WITHOUT_LIVEMEDIA)
+.if (defined(WITH_LIVEMEDIA) || exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)) && !defined(WITHOUT_LIVEMEDIA)
 BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 CONFIGURE_ARGS+=--enable-livedotcom \
 		--with-livedotcom-tree=${LOCALBASE}/live
@@ -644,14 +432,14 @@ CONFIGURE_ARGS+=--enable-galaktos
 CONFIGURE_ARGS+=--disable-galaktos
 .endif
 
-.if (defined(WITH_SAMBA) || exists(${LOCALBASE}/lib/lib/libsmbclient.a)) && !defined(WITHOUT_SAMBA)
+.if !defined(WITHOUT_SAMBA)
 LIB_DEPEND+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 CONFIGURE_ARGS+=--enable-smb
 .else
 CONFIGURE_ARGS+=--disable-smb
 .endif
 
-.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
+.if !defined(WITHOUT_SDL)
 USE_SDL=	image
 CONFIGURE_ARGS+=--enable-sdl
 .else
@@ -675,7 +463,7 @@ LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 CONFIGURE_ARGS+=--disable-slp
 .endif
 
-.if (defined(WITH_SPEEX) || exists(${LOCALBASE}/lib/libspeex.a)) && !defined(WITHOUT_SPEEX)
+.if !defined(WITHOUT_SPEEX)
 LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-speex
 CPPFLAGS+=-I${LOCALBASE}/include/speex
@@ -746,141 +534,5 @@ CONFIGURE_ARGS+=--enable-release
 CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order"
-	@${ECHO_MSG} "to learn how to tune VLC to your personal preferences!"
-	@${ECHO_MSG} ""
-
-post-patch:
-# Subtitle default font
-	@${REINPLACE_CMD} -e \
-	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
-		${WRKSRC}/modules/misc/freetype.c
-# mozilla plugin
-	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
-		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
-			${WRKSRC}/mozilla/Makefile.in
-# skins2 interface, no lrint on < 504000
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
-.endif
-# s/Linux/FreeBSD/
-	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
-		${WRKSRC}/po/*
-	@${RM} -f ${WRKSRC}/po/*.bak
-	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
-		${WRKSRC}/modules/audio_output/oss.c
-# pthreads/cflags
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
-		-e 's/-lc_r/${PTHREAD_LIBS}/' \
-		-e 's|-mcpu=pentiumpro||' \
-		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
-		${WRKSRC}/configure
-# cdrom/dvd support
-	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
-		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
-		${WRKSRC}/include/vlc_config.h
-.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
-	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
-		${WRKSRC}/loader/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
-		${WRKSRC}/loader/module.c
-.endif
-
-pre-build:
-	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
-		${WRKSRC}/vlc-config
-
-pre-install:
-	${RM} -rf ${PLIST} ${FAKEDIR}
-	${MKDIR} ${FAKEDIR}
-	${TOUCH} -f ${PLIST}
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
-.endif
-.if !defined(WITHOUT_WXGTK)
-	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
-.endif
-.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-.endif
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
-	cd ${FAKEDIR}/bin && ${FIND} -s * | \
-		${SED} -e 's|^|bin/|' >> ${PLIST}
-	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/|' >> ${PLIST}
-	cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
-		${SED} -e 's|^|lib/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
-.for dir in vlc
-	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
-		 && ${FIND} -d * -type d | \
-		 ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
-.else
-	${RM} -rf ${FAKEDIR}/share/doc
-.endif
-		${ECHO_MSG} "@dirrm share/vlc" >> ${PLIST}
-.if !defined(WITHOUT_NLS)
-	cd ${FAKEDIR}/share/locale &&  ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/locale/|' >> ${PLIST}
-.endif
-.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
-	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
-		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
-.endif
-.for locale in my oc ps tet tl
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
-.endfor
-
-do-install:
-	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-		${FAKEDIR}/bin/vlc-config
-	@${RM} -f ${FAKEDIR}/bin/*.bak
-	cd ${FAKEDIR}/bin && ${FIND} . | \
-		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
-	cd ${FAKEDIR}/include && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
-	cd ${FAKEDIR}/lib && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
-	cd ${FAKEDIR}/share && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
-.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITH_VLC_MOZILLA_PLUGIN)
-	@${MKDIR} ${PREFIX}/lib/browser_plugins
-	${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
-.endif
-	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
-.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
-	if [ ! -d ${PREFIX}/share/applications ]; then \
-		${MKDIR} ${PREFIX}/share/applications ; \
-	fi
-	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
-		${MKDIR} ${PREFIX}/share/pixmaps ; \
-	fi
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
-.endif
-.if !defined(WITHOUT_WXGTK)
-	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
-.endif
-.endif
-
+.include "${.CURDIR}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
new file mode 100644
index 000000000000..52c96e0004bd
--- /dev/null
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -0,0 +1,371 @@
+
+# NOTES about VLC Knobs:
+# Below you will see a number of knobs, if it starts with WITHOUT_ it is
+# enabled by default, if it starts with WITH_ it is disabled by default
+# and will be autodetected to enable
+#
+# $FreeBSD$
+#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.1 2006/05/06 06:06:47 ahze Exp $
+#
+# If you define for example WITH_FAAD and WITHOUT_FAAD
+# the WITHOUT_ will always over ride the WITH_.
+#
+# Interface Knobs:
+#
+# WITH_CORBA
+#  Enable a Corba interface via orbit2
+#
+# WITH_NCURSES=yes
+#  Ncurses (console) interface
+#
+# WITH_SKINS
+#  This Interface supports a skinned gtk2.0 interface
+#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
+#
+# WITHOUT_WXGTK=yes
+#  WxWindows/Gtk 2.x Interface
+#  This is the default and most supported
+#  x11 interface
+#
+# WITH_WXGTK_VER=[2.4|2.6]
+#  Choose a WxGTK version you want to use.
+#  Defaults to 26
+#
+# Audio Knobs:
+#
+# WITH_ARTS=yes
+#  Arts Support
+#
+# WITHOUT_DAAP=yes
+#  Enable libopendaap to connect to iTunes(R) music shares.
+#
+# WITHOUT_DTS=yes
+#  DTS decoder Support
+#  useful for many dvds
+#
+# WITH_ESOUND=yes
+#  Esound Support
+#
+# WITH_FAAC=yes
+#  Faac audio encoder (mp4/aac) Support
+#  ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
+#
+# WITH_FAAD=yes
+#  Faad audio decoder (mp4/aac) Support
+#
+# WITH_FLAC=yes
+#  Flac Support
+#
+# WITHOUT_LAME=yes
+#  Mp3 encoder Support
+#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
+#
+# WITHOUT_A52=yes
+#  liba52 audio Support
+#
+# WITH_REALAUDIO
+#  Real audio(R) support
+#
+# WITH_SHOUT
+#  Libshout2 support
+#
+# WITH_TREMOR
+#  Interger-only Ogg Vorbis decoder
+#   !!experimental!!
+#
+# WITHOUT_MAD=yes
+#  Mad mp3 audio decoder Support
+#
+# WITHOUT_OGG=yes
+#  Ogg audio decoder Support
+#
+# WITHOUT_SPEEX=yes
+#  Speex voice codec Support
+#
+# WITH_TWOLAME=yes
+#  Twolame Mpeg layer 2 audio Support
+#
+# WITHOUT_VORBIS=yes
+#  Vorbis Support
+#
+# Graphics Knobs:
+#
+# WITH_AALIB=yes
+#  Console Graphics Support
+#
+# WITH_CACA=yes
+#  Console Graphics Support (implies WITH_AALIB)
+#
+# WITH_DV=yes
+#  Digital video input
+#
+# WITH_FRIBIDI=yes
+#
+# WITH_GGI=yes
+#
+# WITHOUT_SDL=yes
+#  SDL video output
+#
+# WITH_SVG=yes
+#
+# WITH_SVGALIB=yes
+#  SVGAlib video output
+#
+# WITH_XOSD=yes
+#
+# Multimedia Knobs:
+#
+# WITH_DIRAC
+#  Enable dirac general-purpose video codec
+#
+# WITHOUT_X264
+#  Enable H.264/AVC Video Support
+#
+# WITHOUT_MATROSKA=yes
+#  Matroska Container Format Support
+#
+# WITHOUT_MPEG2=yes
+#  Mpeg-2 A/V Decoder Support
+#
+# WITH_THEORA=yes
+#  Video codec for OGG/Vorbis Support
+#
+# WITH_TRANSCODE=yes
+#  Disable transcode of multimedia via transcode (multimedia/transcode).
+#  This option allows you to convert a media file, dvd, A/V stream, etc
+#  in to another format. This also allows you to transcode multimedia
+#  on-the-fly and stream to a network and/or local playback.
+#
+# Streaming Knobs:
+#
+# WITHOUT_HTTPD=yes
+#  Web interface to control streaming media
+#
+# WITH_LIVEMEDIA=yes
+#  Support for rstp/rtp/sdp protocols
+#  Only versions 2004.11.11 and higher are supported.
+#
+# WITHOUT_STREAM_PLUGINS=yes
+#  Disable build and install of Streaming plugins
+#
+# WITH_WIN32_CODECS=yes
+#  Support for win32 multimedia DLL's
+#
+# Other Knobs:
+#
+# WITHOUT_AVAHI=yes
+#  Avahi (Rendezvous/Bonjour (R) ) networking
+#
+# WITH_DEBUG=yes
+#  Enable debuging support
+#
+# WITHOUT_CDROM=yes
+#  Disable cddb and vcd support
+#   and other cdrom support
+#
+# WITHOUT_CDPARANOIA=yes
+#  Disable Cdparanoia support
+#
+# WITHOUT_DVBPSI=yes
+#  TS MUX and DEMUX support
+#
+# WITHOUT_DVDNAV=yes
+#  Disable DVD (dvd menus) support
+#
+# WITH_DVDREAD=yes
+#  Enable Regular DVD support (non-menu)
+#
+# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
+# WITH_VLC_MOZILLA_PLUGIN= yes
+#  Enable A mozilla plugin for VLC
+#  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
+#  for more info on using this plugin.
+#   defaults to www/mozilla
+#
+#  NOTE: The www/mplayer-plugin is much more complete.
+#
+# WITHOUT_GNOMEVFS
+#  GnomeVFS support
+#
+# WITHOUT_HAL=yes
+#  Disable HAL support
+#
+# WITH_OPENGL=yes
+#  Enable OpenGL visual plugin (not playback, play back is default with X11)
+#
+# WITHOUT_SAMBA=yes
+#  Enable SAMBA Access module
+#
+# WITH_SSL=yes
+#  Enable TLS/SSL Support for web (httpd) interface
+#
+# WITHOUT_SLP=yes
+#  Disable SLP service discovery support
+#  * recommended if you want to stream media
+#
+# WITH_OPTIMIZED_CFLAGS=yes
+#  Compile with -O2 -ffast-math -fomit-frame-pointer
+#
+# WITH_DVD_DEVICE=/dev/somedevice
+#  default 5.x and above: /dev/acd0
+#  default 4.x and below: /dev/acd0c
+#  This option changes the default dvd device
+#
+# WITH_CDROM_DEVICE=/dev/somedevice
+#  default 5.x and above: /dev/acd0
+#  default 4.x and below: /dev/acd0c
+#  This option changes the default cdrom device
+#
+# WITHOUT_NLS=yes
+#  Disable Languarge Support
+#
+# WITHOUT_STREAM_PLUGINS=yes
+#  Disable ALL streaming plugins.
+#
+# WITH_VLC_DEFAULT_FONT=/path/to/font
+#  default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
+#  This option lets you change the default font for subtitles
+#
+# NOPORTDOCS=yes
+#  Do not install Vlc's Documents
+#
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order"
+	@${ECHO_MSG} "to learn how to tune VLC to your personal preferences!"
+	@${ECHO_MSG} ""
+.if !defined(BATCH) || !defined(PACKAGE_BUILDING)
+	@sleep 2
+.endif
+
+post-patch:
+# Subtitle default font
+	@${REINPLACE_CMD} -e \
+	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
+		${WRKSRC}/modules/misc/freetype.c
+# mozilla plugin
+	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
+		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
+			${WRKSRC}/mozilla/Makefile.in
+# skins2 interface, no lrint on < 504000
+.if ${OSVERSION} < 504000
+	@${REINPLACE_CMD} -e 's|lrint|rint|' \
+		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
+.endif
+# s/Linux/FreeBSD/
+	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
+		${WRKSRC}/po/*
+	@${RM} -f ${WRKSRC}/po/*.bak
+	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
+		${WRKSRC}/modules/audio_output/oss.c
+# pthreads/cflags
+	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
+		-e 's/-lc_r/${PTHREAD_LIBS}/' \
+		-e 's|-mcpu=pentiumpro||' \
+		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
+		${WRKSRC}/configure
+# cdrom/dvd support
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
+		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+		${WRKSRC}/include/vlc_config.h
+.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
+	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
+		${WRKSRC}/loader/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
+		${WRKSRC}/loader/module.c
+.endif
+
+pre-build:
+	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
+		${WRKSRC}/vlc-config
+
+pre-install:
+	${RM} -rf ${PLIST} ${FAKEDIR}
+	${MKDIR} ${FAKEDIR}
+	${TOUCH} -f ${PLIST}
+.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
+	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
+.endif
+.if !defined(WITHOUT_WXGTK)
+	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
+.endif
+.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endif
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+	cd ${FAKEDIR}/bin && ${FIND} -s * | \
+		${SED} -e 's|^|bin/|' >> ${PLIST}
+	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|include/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm include/|' >> ${PLIST}
+	cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
+		${SED} -e 's|^|lib/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
+.for dir in vlc
+	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
+.endfor
+.if !defined(NOPORTDOCS)
+	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
+		 && ${FIND} -d * -type d | \
+		 ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
+.else
+	${RM} -rf ${FAKEDIR}/share/doc
+.endif
+		${ECHO_MSG} "@dirrm share/vlc" >> ${PLIST}
+.if !defined(WITHOUT_NLS)
+	cd ${FAKEDIR}/share/locale &&  ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/locale/|' >> ${PLIST}
+.endif
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
+	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
+		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
+.endif
+.for locale in my oc ps tet tl
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endfor
+
+do-install:
+	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
+		${FAKEDIR}/bin/vlc-config
+	@${RM} -f ${FAKEDIR}/bin/*.bak
+	cd ${FAKEDIR}/bin && ${FIND} . | \
+		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
+	cd ${FAKEDIR}/include && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
+	cd ${FAKEDIR}/lib && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
+	cd ${FAKEDIR}/share && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITH_VLC_MOZILLA_PLUGIN)
+	@${MKDIR} ${PREFIX}/lib/browser_plugins
+	${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
+.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
+.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
+	if [ ! -d ${PREFIX}/share/applications ]; then \
+		${MKDIR} ${PREFIX}/share/applications ; \
+	fi
+	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
+		${MKDIR} ${PREFIX}/share/pixmaps ; \
+	fi
+.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
+	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
+.endif
+.if !defined(WITHOUT_WXGTK)
+	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
+.endif
+.endif
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 847eafd5ebef..eb225f04a05e 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-0.8.5-test4.tar.bz2) = c7e06ee27097493cb3dcdffe5d8be36e
-SHA256 (vlc-0.8.5-test4.tar.bz2) = 0a93d9499cae65ae911f4330a2860864d4f404440d5e17df4c471c2d0ff438f7
-SIZE (vlc-0.8.5-test4.tar.bz2) = 8450554
+MD5 (vlc-snapshot-20060507.tar.gz) = 96385e65abfd3765d9c0f925a44ca278
+SHA256 (vlc-snapshot-20060507.tar.gz) = efe8248d3876e331fbd5c2e46371294eb7ed91db139f7e9bbe8f95ae397c914b
+SIZE (vlc-snapshot-20060507.tar.gz) = 11648478
diff --git a/multimedia/vlc-devel/files/patch-include_vlc_control.h b/multimedia/vlc-devel/files/patch-include_vlc_control.h
deleted file mode 100644
index 0cd3ac2d17f9..000000000000
--- a/multimedia/vlc-devel/files/patch-include_vlc_control.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- /dev/null	Mon Jan  2 14:48:08 2006
-+++ include/vlc_control.h	Mon Jan  2 14:46:25 2006
-@@ -0,0 +1,53 @@
-+/*****************************************************************************
-+ * control.h: private header for mediacontrol
-+ *****************************************************************************
-+ * Copyright (C) 2005 the VideoLAN team
-+ * $Id: vlc.h 10101 2005-03-02 16:47:31Z robux4 $
-+ *
-+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-+ *****************************************************************************/
-+
-+#ifndef _VLC_PRIVATE_CONTROL_H
-+#define _VLC_PRIVATE_CONTROL_H 1
-+
-+# ifdef __cplusplus
-+extern "C" {
-+# endif
-+
-+#include <vlc/vlc.h>
-+#include "vlc/control_structures.h"
-+
-+typedef struct {
-+    vlc_object_t  *p_vlc;
-+    playlist_t    *p_playlist;
-+    intf_thread_t *p_intf;
-+    int           vlc_object_id;
-+} mediacontrol_Instance;
-+
-+vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
-+                                       mediacontrol_PositionKey from,
-+                                       mediacontrol_PositionKey to,
-+                                       vlc_int64_t value );
-+vlc_int64_t mediacontrol_position2microsecond(
-+    input_thread_t *p_input,
-+    const mediacontrol_Position *pos );
-+
-+# ifdef __cplusplus
-+}
-+# endif
-+
-+#endif