Import development version of vic from UCL/Avats/Sumover.

Compared to existing mbone/vic there has 12 years of developments and
thus rather too much to list here. Highlights include:

v2.8ucl-1.4.0beta:
New Video window right-click menu

v2.8ucl-1.3.1:
New Codecs:
	H.264 compliant with RFC3640 {NCHC, UCL}
	MPEG4 compliant with RFC3894 {NCHC}
Advanced rendering:
	Full-Screen mode, Video window scaling in software
	X11 XVideo - hardware scaling/colourspace conversion
	Source-Specific Multicast (SSM) support

v2.8ucl-1.2.0
New codec h261as - contributed by Rhys Hawkins (Rhys.Hawkins@anu.edu.au) at Australian National University (ANU). This codec enables interoperability with Rhys' VP tool available to the AccessGrid community.  Use configure --disable-h261as to disable it.
Added image overlay support. This allows a PPM image to be used as an institutional logo, (for example, added sample UCL logo file: ucl_logo.ppm), which can be placed and moved over the video window. Overlays work with all grabbers and codecs. The logo image can also be specified as a vic resource (in .vic.tcl) so that it is made available at startup. Also, tweaked error return values from oTcl to C++, so that all errors relating to overlays are handled gracefully.
Added a LICENSE file.
Added focus property in the generic tcl mk.entry() function that builds text entry widgets.
Added more graceful error handling so Vic will bring up a warning dialogue instead of crashing.
Added Source-Specific Multicast (SSM) support - tested IPv4 on WinXP. IPv6 on Linux not fully tested.

v2.8ucl-1.1.7:
Updated video4linux2 driver so it works with latest API - i.e. with linux kernel 2.6.x. Modified configure to so it can be selected. The old v4l2 driver is still there as grabber-v4l2-old.
Updated configure so it includes both v4l1 v4l2 drivers as there are still devices that use v4l1 in 2.6.x kernel - like the Philips USB cams.
Modified xv-grabber so it's optional in configure. Also modified it to handle mulitple devices - though none to test with.

v2.8ucl-1.1.4:
Added check in configure to turn off optimisation in h261 decoder code if we're using GCC 2.96 (otherwise it crashes).
Added loopback fixes

v2.8ucl-1.1.3:
Updated so a new menu item is added to each decode window allowing users to select number of layers to receive on a layered feed. The Encode layers slider used to attempt do this but didn't work with more than one layered feed.
Added number of layers indicator to info field on decoded feeds
Added -v option to ouput version number.
Added command line options to specify interface (-i addr) and IPv6 interface index (-x index)
Updated to use getaddrinfo for name lookup - using the supplementary function included into common library when using MUSICA IPv6.
Altered the way the addresses are allocated - Now referenced through the network object (Before they were allocated by stepping thru all available address types untill one address type resolved - Which could have caused some problems - also generated errors from the failed resolve attempts)
Corrected the positioning of the padding bit in the rtcp header. Retained some compatibility with old version which used to put it in first packet. Also the length in the rtcp packet did not include the padding - it now does. It doesn't appear to break when interworking with the older version so far....
Corrected bug which meant vic attempte to delete it's local src from the list of sources when it appears to go idle for a long time - happens when vic gets suspended for a while.
Altered net-ipv6 so the IPv6 interface index is not used IPV6_MULTICAST_IF unless set on the command line as it seems to cause problems for FreeBSD. It is now set to -1 in the resourses to indicate its uninitialised state.
corrected IPPROTO_IP used in net-ipv6 loopback command to use IPPROTO_IPV6
Tweaked so the send socket binds to command line specified -i interface, if specified, otherwise it binds to in6addr_any
Corrected bug in IPv6 when TTL is set on Command line - it was calling the ipv4 proc to check for multicast - now calls in6_multicast
Enabled -m (mtu) option on command line - Use with care as not all codecs will behave correctly. (it's default is 1024).

v2.8ucl-1.1.2:
Fixed RTCP bug - The SSRC wasn't being set when transmitting (well it was always -1)
Introduced factor of 2 into the PKTBUF_SIZE as the H261 codec seems to over-run the buffer a bit - causing random errors.
Disabled mbus recognised message - No longer crash when we receive an unknown mbus command.
Increase heartbeat rate to comply with latest spec
Added codec/h263/*.o to clean directive.
Changed name of UCL's common library to new name: libuclmmbase.a (from old libcommon.a)
Updates for the mbus parser..
Changed to make x11 grabber last choice by popular demand

v2.8ucl-1.1.1:
Tidied up command line option specification string
Updated for new common library
Updated to keep gcc-2.95 happy

v2.8ucl-1.1.0:
Expermental first release of layered support taken from MASH project vic.
Creates seperate network objects for each layer and sends seperate RTCP reports (unchecked in this release - these are not quite working)
Incoperated PVH codec from MASH
New command line option -j num_of_layers

v2.8ucl-1.0:
Reorganised code into directory structure reflecting the functionality of the different modules of vic
Moved vic over to use UCL's version's of tcl/tk - this is due to a number of problems we have encountered
Moved vic over to use UCL's common library so it shares the codebase provided by rat - where possible; It now uses common DES code and Mbus code - so both the DES and Mbus sections have been re-written.
IPv6 support under UNIX and WIN32

v2.8ucl5:
Fixed -l option so it instead generates a filename automatically

v2.8ucl4:
Updated H263 support for Litte Endian machines
Updated grabber-x11 so it works on more machines and when running vic on a remote X server

v2.8ucl3:

Added H.263 codec for UNIX
Included many useful fixes from Bill Fenner

v2.8ucl2:
Added JPEG and bvc software codecs

v2.8ucl1:
Port to Tcl/Tk 8.0
Added DES support
Added H.263+ codec

12 files changed, 660 insertions, 0 deletions

diff --git a/mbone/vic-devel/DESCR b/mbone/vic-devel/DESCR
new file mode 100644
index 00000000000..a21e3327c1d
--- /dev/null
+++ b/mbone/vic-devel/DESCR
@@ -0,0 +1,12 @@
+The UCB/LBNL video tool, vic, is a real-time, multimedia application
+for video conferencing over the Internet.
+
+Vic was designed with a flexible and extensible architecture to support
+heterogeneous environments and configurations.  For example, in high
+bandwidth settings, multi-megabit full-motion JPEG streams can be
+sourced using hardware assisted compression, while in low bandwidth
+environments like the Internet, aggressive low bit-rate coding can
+be carried out in software.
+
+This version includes Video4Linux2 support as well as H.264 and MPEG4
+codecs.
diff --git a/mbone/vic-devel/Makefile b/mbone/vic-devel/Makefile
new file mode 100644
index 00000000000..b08ae62752d
--- /dev/null
+++ b/mbone/vic-devel/Makefile
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+
+DISTNAME=	vic-2.8ucl1.4.0beta-4337
+PKGNAME=	vic-devel-2.8.1.4.0beta.4337
+CATEGORIES=	mbone tk
+MASTER_SITES=	http://www.NetBSD.org/~sborrill/snapshots/
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	vic-2.8ucl1.4.0_ov511.diff.gz
+.endif
+
+MAINTAINER=	sborrill@NetBSD.org
+HOMEPAGE=	http://mediatools.cs.ucl.ac.uk/nets/mmedia/
+COMMENT=	MBONE video conferencing tool
+EXTRACT_SUFX=	.tgz
+
+WRKSRC=		${WRKDIR}/vic-mpeg4
+GNU_CONFIGURE=	yes
+
+USE_LANGUAGES=	c c++
+
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
+
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
+.include "../../graphics/libv4l/buildlink3.mk"
+.endif
+
+CONFLICTS+=	vic-[0-9]*
+
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../mbone/common-mml/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vic-devel/PLIST b/mbone/vic-devel/PLIST
new file mode 100644
index 00000000000..45f9c5e8d4e
--- /dev/null
+++ b/mbone/vic-devel/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+bin/histtolut
+bin/vic
+man/vic.1
diff --git a/mbone/vic-devel/distinfo b/mbone/vic-devel/distinfo
new file mode 100644
index 00000000000..c800a589262
--- /dev/null
+++ b/mbone/vic-devel/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+
+SHA1 (vic-2.8ucl1.4.0_ov511.diff.gz) = 46faceb1d926820e41ffda71228f63959747a73e
+RMD160 (vic-2.8ucl1.4.0_ov511.diff.gz) = b60a9d3f5764cc4528dffbf5e9465301d71723de
+Size (vic-2.8ucl1.4.0_ov511.diff.gz) = 8646 bytes
+SHA1 (vic-2.8ucl1.4.0beta-4337.tgz) = 6c15491fa5bdfaedf94731094f8952ed3ff027bb
+RMD160 (vic-2.8ucl1.4.0beta-4337.tgz) = 631b18fe036c289e5622722e521af2c9735c63da
+Size (vic-2.8ucl1.4.0beta-4337.tgz) = 9345775 bytes
+SHA1 (patch-Makefile.in) = f908c984d9bd9c216ceda0eba99987904eea4dfd
+SHA1 (patch-configure) = 509e31f0e0c1037701d7f012569ac5e5e1e4c033
+SHA1 (patch-crypt-rijndael.cpp) = 5dfda8c17c91fa5f6b2df24d4e1ed93bc4ae5b87
+SHA1 (patch-grabber-v4l2.cpp) = e9ef03d31f336976e220291646028916712e71a7
+SHA1 (patch-main.cpp) = 671cda41595f1f5c001b089ee04b5c84f559330a
+SHA1 (patch-ui-ctrlmenu.tcl) = b81763c2642f3d1eb828cbac4e687c7bf9bc1ba2
+SHA1 (patch-ui-resource.tcl) = 1763779af32de2d19b4352eb7174f9edd9f7be16
diff --git a/mbone/vic-devel/options.mk b/mbone/vic-devel/options.mk
new file mode 100644
index 00000000000..889353372d4
--- /dev/null
+++ b/mbone/vic-devel/options.mk
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.vic
+PKG_SUPPORTED_OPTIONS=		inet6 vic-gpl
+PKG_SUGGESTED_OPTIONS=		vic-gpl
+
+.include "../../mk/bsd.options.mk"
+
+## IPv6 support
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+## mpeg4+x264 support (ffmpeg)
+
+.if !empty(PKG_OPTIONS:Mvic-gpl)
+CONFIGURE_ARGS+=	--enable-gpl
+CONFIGURE_ARGS+=	--disable-ffmpeg-co
+CONFIGURE_ARGS+=	--disable-x264-co
+CONFIGURE_ARGS+=	--with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg}/include
+CONFIGURE_ARGS+=	--with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg}/lib
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+
+CONFIGURE_ARGS+=	--with-x264inc=${BUILDLINK_PREFIX.x264-devel}/include
+CONFIGURE_ARGS+=	--with-x264lib=${BUILDLINK_PREFIX.x264-devel}/lib
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.endif
diff --git a/mbone/vic-devel/patches/patch-Makefile.in b/mbone/vic-devel/patches/patch-Makefile.in
new file mode 100644
index 00000000000..5945b6e916d
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+Dynamically link common mml library
+
+--- Makefile.in.orig	2008-12-10 21:06:38.000000000 +0000
++++ Makefile.in	2008-12-10 21:06:52.000000000 +0000
+@@ -92,7 +92,7 @@
+ CODEC_LIB = @V_CODEC_LIB@ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a
+ 
+ LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ $(CODEC_LIB) $(VIDEO_LIB) \
+-	../common/src/libuclmmbase.a -lm -lz -lpthread @V_LIB_FFMPEG@ @V_LIB_X264@ 
++	-luclmmbase -lm -lz -lpthread @V_LIB_FFMPEG@ @V_LIB_X264@ 
+ 
+ 
+ INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
diff --git a/mbone/vic-devel/patches/patch-configure b/mbone/vic-devel/patches/patch-configure
new file mode 100644
index 00000000000..eb480c40e21
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-configure
@@ -0,0 +1,399 @@
+$NetBSD: patch-configure,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+- Portability fixes
+- pkgsrc ffmpeg includes path
+- pkgsrc common-mml includes path
+- NetBSD v4l2 support
+- ov511 support on NetBSD
+
+--- configure.orig	2008-12-10 19:28:01.000000000 +0000
++++ configure	2008-12-14 11:05:24.000000000 +0000
+@@ -4538,7 +4538,7 @@
+         V_DEFINE="$V_DEFINE -DMAC_OSX_TCL"
+     fi
+ 
+-elif test "${TCL_VERSION}" == "8.0" ; then
++elif test "${TCL_VERSION}" = "8.0" ; then
+     if test -f "${TCL_SRC_DIR}/generic/tcl2c.c" ; then
+         { echo "$as_me:$LINENO: result: UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&5
+ echo "${ECHO_T}UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&6; }
+@@ -4752,7 +4752,7 @@
+ 
+ { echo "$as_me:$LINENO: checking for a compatible version of Tk" >&5
+ echo $ECHO_N "checking for a compatible version of Tk... $ECHO_C" >&6; }
+-if test "${TCL_VERSION}" == "${TK_VERSION}"; then
++if test "${TCL_VERSION}" = "${TK_VERSION}"; then
+     { echo "$as_me:$LINENO: result: Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&5
+ echo "${ECHO_T}Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&6; }
+ 
+@@ -5012,14 +5012,14 @@
+   if test "$ffmpegco" != "yes"; then
+ 
+ 	if test "$ffmpeginc" != "" ; then
+-	   if test ! -r $ffmpeginc/ffmpeg/avcodec.h ; then
+-	        echo "Error! you need to have $ffmpeginc/ffmpeg/avcodec.h around"
++	   if test ! -r $ffmpeginc/libavcodec/avcodec.h ; then
++	        echo "Error! you need to have $ffmpeginc/libavcodec/avcodec.h around"
+ 	        exit 1
+-	   elif test ! -r $ffmpeginc/ffmpeg/avutil.h ; then
+-	        echo "Error! you need to have $ffmpeginc/ffmpeg/avutil.h around"
++	   elif test ! -r $ffmpeginc/libavutil/avutil.h ; then
++	        echo "Error! you need to have $ffmpeginc/libavutil/avutil.h around"
+ 	        exit 1
+-	   elif test ! -r $ffmpeginc/ffmpeg/swscale.h ; then
+-	        echo "Error! you need to have $ffmpeginc/ffmpeg/swscale.h around"
++	   elif test ! -r $ffmpeginc/libswscale/swscale.h ; then
++	        echo "Error! you need to have $ffmpeginc/libswscale/swscale.h around"
+ 	        exit 1
+ 	   fi
+ 	   echo "checking for FFmpeg headers...yes"
+@@ -5028,8 +5028,8 @@
+ 	else
+ 
+ 	   if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+-  { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
+-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
++echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+@@ -5037,8 +5037,8 @@
+ echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; }
+ else
+   # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5
+-echo $ECHO_N "checking ffmpeg/avcodec.h usability... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h usability" >&5
++echo $ECHO_N "checking libavcodec/avcodec.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5046,7 +5046,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -5078,15 +5078,15 @@
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5
+-echo $ECHO_N "checking ffmpeg/avcodec.h presence... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h presence" >&5
++echo $ECHO_N "checking libavcodec/avcodec.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -5119,30 +5119,30 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&2;}
+ 
+     ;;
+ esac
+-{ echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
+-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
++echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5163,8 +5163,8 @@
+ 
+ 
+ 	   if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
+-  { echo "$as_me:$LINENO: checking for ffmpeg/avutil.h" >&5
+-echo $ECHO_N "checking for ffmpeg/avutil.h... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for libavutil/avutil.h" >&5
++echo $ECHO_N "checking for libavutil/avutil.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+@@ -5172,8 +5172,8 @@
+ echo "${ECHO_T}$ac_cv_header_ffmpeg_avutil_h" >&6; }
+ else
+   # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking ffmpeg/avutil.h usability" >&5
+-echo $ECHO_N "checking ffmpeg/avutil.h usability... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libavutil/avutil.h usability" >&5
++echo $ECHO_N "checking libavutil/avutil.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5181,7 +5181,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <ffmpeg/avutil.h>
++#include <libavutil/avutil.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -5213,15 +5213,15 @@
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ echo "$as_me:$LINENO: checking ffmpeg/avutil.h presence" >&5
+-echo $ECHO_N "checking ffmpeg/avutil.h presence... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libavutil/avutil.h presence" >&5
++echo $ECHO_N "checking libavutil/avutil.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <ffmpeg/avutil.h>
++#include <libavutil/avutil.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -5254,30 +5254,30 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/avutil.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: ffmpeg/avutil.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libavutil/avutil.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libavutil/avutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libavutil/avutil.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libavutil/avutil.h: in the future, the compiler will take precedence" >&2;}
+ 
+     ;;
+ esac
+-{ echo "$as_me:$LINENO: checking for ffmpeg/avutil.h" >&5
+-echo $ECHO_N "checking for ffmpeg/avutil.h... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for libavutil/avutil.h" >&5
++echo $ECHO_N "checking for libavutil/avutil.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5298,8 +5298,8 @@
+ 
+ 
+ 	   if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
+-  { echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
+-echo $ECHO_N "checking for ffmpeg/swscale.h... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for libswscale/swscale.h" >&5
++echo $ECHO_N "checking for libswscale/swscale.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+@@ -5307,8 +5307,8 @@
+ echo "${ECHO_T}$ac_cv_header_ffmpeg_swscale_h" >&6; }
+ else
+   # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking ffmpeg/swscale.h usability" >&5
+-echo $ECHO_N "checking ffmpeg/swscale.h usability... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libswscale/swscale.h usability" >&5
++echo $ECHO_N "checking libswscale/swscale.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5316,7 +5316,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -5348,15 +5348,15 @@
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ echo "$as_me:$LINENO: checking ffmpeg/swscale.h presence" >&5
+-echo $ECHO_N "checking ffmpeg/swscale.h presence... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libswscale/swscale.h presence" >&5
++echo $ECHO_N "checking libswscale/swscale.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -5389,30 +5389,30 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libswscale/swscale.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libswscale/swscale.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libswscale/swscale.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libswscale/swscale.h: in the future, the compiler will take precedence" >&2;}
+ 
+     ;;
+ esac
+-{ echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
+-echo $ECHO_N "checking for ffmpeg/swscale.h... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for libswscale/swscale.h" >&5
++echo $ECHO_N "checking for libswscale/swscale.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6425,7 +6425,7 @@
+ if test "$v4l2old" = "yes" ; then
+                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2-old.o"
+ 		echo "Using old Linux grabber-v4l2"
+-elif test -r /usr/include/linux/videodev.h ; then
++elif test -r /usr/include/linux/videodev.h -o -r /usr/include/sys/videoio.h ; then
+         if test "${ac_cv_header_libv4lconvert_h+set}" = set; then
+   { echo "$as_me:$LINENO: checking for libv4lconvert.h" >&5
+ echo $ECHO_N "checking for libv4lconvert.h... $ECHO_C" >&6; }
+@@ -6553,7 +6553,11 @@
+ fi
+ if test $ac_cv_header_libv4lconvert_h = yes; then
+   V_DEFINE="$V_DEFINE -DHAVE_LIBV4L"
+-         V_LIB_GRABBER="$V_LIB_GRABBER -lv4l1 -lv4l2"
++	if test -r /usr/include/sys/videoio.h; then
++		V_LIB_GRABBER="$V_LIB_GRABBER -lv4l2"
++	else
++		V_LIB_GRABBER="$V_LIB_GRABBER -lv4l1 -lv4l2"
++	fi
+ else
+   V_OBJ_GRABBER="$V_OBJ_GRABBER  video/tinyjpeg.o video/jidctflt.o"
+ fi
+@@ -6562,6 +6566,9 @@
+         if test -r /usr/include/linux/videodev2.h  ; then
+                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o video/grabber-video4linux.o"
+ 		echo "Using Linux Grabbers: Video4Linux2 and Video4Linux1"
++	elif test -r /usr/include/sys/videoio.h; then
++                V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o"
++		echo "Using NetBSD Grabbers: Video4Linux2"
+         else
+                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
+ 		echo "Using Linux Grabber: Video4Linux1"
+@@ -6790,8 +6797,9 @@
+ 	V_LIB="$V_LIB -lipc"
+ 	;;
+ *-*-netbsd*)
++	V_STATIC=""
+ 	V_TARCMD="tar -h -c -f"
+-	V_LIB="$V_LIB -L/usr/local/lib"
++	V_OBJ_GRABBER="video/grabber-ov511.o $V_OBJ_GRABBER"
+ 	;;
+ *-*-freebsd*)
+ 	V_STATIC=""
+@@ -7077,7 +7085,8 @@
+ 
+ # various include hacks
+ dirs="/usr/src/local/include-fixes \
+-	/import/mcast/include"
++	/import/mcast/include \
++	$prefix/include/common-mml"
+ for dir in $dirs; do
+ 	if test -d $dir ; then
+ 		V_INCLUDE="$V_INCLUDE -I$dir"
diff --git a/mbone/vic-devel/patches/patch-crypt-rijndael.cpp b/mbone/vic-devel/patches/patch-crypt-rijndael.cpp
new file mode 100644
index 00000000000..95869e06be5
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-crypt-rijndael.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-crypt-rijndael.cpp,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+Fix typecasting
+
+--- net/crypt-rijndael.cpp.orig	2008-12-10 20:50:35.000000000 +0000
++++ net/crypt-rijndael.cpp	2008-12-10 20:53:37.000000000 +0000
+@@ -103,11 +103,11 @@
+     // The vic framework gives us an md5 hash which is 16 bytes long.
+     //
+     int keylen = 16;
+-    rc = makeKey(&keyInstEncrypt_, DIR_ENCRYPT, keylen * 8, (BYTE *) key);
++    rc = makeKey(&keyInstEncrypt_, DIR_ENCRYPT, keylen * 8, (char *) key);
+     if (rc < 0)
+ 	debug_msg("makeKey failed: %d\n", rc);
+ 
+-    rc = makeKey(&keyInstDecrypt_, DIR_DECRYPT, keylen * 8, (BYTE *) key);
++    rc = makeKey(&keyInstDecrypt_, DIR_DECRYPT, keylen * 8, (char *) key);
+     if (rc < 0)
+ 	debug_msg("makeKey failed: %d\n", rc);
+ 
diff --git a/mbone/vic-devel/patches/patch-grabber-v4l2.cpp b/mbone/vic-devel/patches/patch-grabber-v4l2.cpp
new file mode 100644
index 00000000000..483c26e56f2
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-grabber-v4l2.cpp
@@ -0,0 +1,25 @@
+--- video/grabber-v4l2.cpp.orig	2008-12-13 22:12:50.000000000 +0000
++++ video/grabber-v4l2.cpp	2008-12-13 22:14:26.000000000 +0000
+@@ -34,7 +34,9 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <errno.h>
++#ifdef __Linux__
+ #include <endian.h>
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/fcntl.h>
+@@ -48,8 +50,12 @@
+ 
+ extern "C"
+ {
++#ifdef __NetBSD__
++#include <sys/videoio.h>
++#else
+ #include <asm/types.h>
+ #include <linux/videodev2.h>
++#endif
+ }
+ 
+ #ifdef HAVE_LIBV4L
diff --git a/mbone/vic-devel/patches/patch-main.cpp b/mbone/vic-devel/patches/patch-main.cpp
new file mode 100644
index 00000000000..2bab179d123
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-main.cpp
@@ -0,0 +1,34 @@
+$NetBSD: patch-main.cpp,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+Add option to disable overlay UI
+
+--- main.cpp.orig	2008-12-14 12:19:53.000000000 +0000
++++ main.cpp	2008-12-14 12:21:00.000000000 +0000
+@@ -152,6 +152,7 @@
+ 	 \t[-f bvc|cellb|h261|jpeg|nv|mpeg4|h264] [-F maxfps] [-i ifAddr ] [-I channel]\n\
+ 	 \t[-K key ] [-L flowLabel (ip6 only)] [-l (creates log file)]\n\
+ 	 \t[-M colormap] [-m mtu] [-N session] [-n atm|ip|ip6|rtip]\n\
++	 \t[-O (disables overlay) ]\n\
+ 	 \t[-o clipfile] [-t ttl] [-U interval] [-u script] [-v version] [-V visual]\n\
+ 	 \t[-x ifIndex (ip6 only)] [-X resource=value] [-j numlayers] dest/port[/fmt/ttl]\n";
+ 
+@@ -504,7 +505,7 @@
+ #endif
+ 	// Option list; If letter is followed by ':' then it takes an argument
+ 	const char* options = 
+-		"A:B:C:c:D:d:f:F:HI:i:j:K:lL:M:m:N:n:o:Pq:rsST:t:U:u:vV:w:x:X:y";
++		"A:B:C:c:D:d:f:F:HI:i:j:K:lL:M:m:N:n:o:OPq:rsST:t:U:u:vV:w:x:X:y";
+ 	/* process display and window (-use) options before initialising tcl/tk */
+ 	char buf[256], tmp[256];
+ 	const char *display=0, *use=0;
+@@ -678,6 +679,10 @@
+ 			tcl.add_option("network", optarg);
+ 			break;
+ 
++		case 'O':
++			tcl.add_option("overlayEnabled", "false");
++			break;
++
+ 		case 'o':
+ 			tcl.add_option("outfile", optarg);
+ 			break;
diff --git a/mbone/vic-devel/patches/patch-ui-ctrlmenu.tcl b/mbone/vic-devel/patches/patch-ui-ctrlmenu.tcl
new file mode 100644
index 00000000000..ed8778f244d
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-ui-ctrlmenu.tcl
@@ -0,0 +1,53 @@
+$NetBSD: patch-ui-ctrlmenu.tcl,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+Add option to disable overlay UI
+
+--- tcl/ui-ctrlmenu.tcl.orig	2008-12-14 12:21:43.000000000 +0000
++++ tcl/ui-ctrlmenu.tcl	2008-12-14 12:21:55.000000000 +0000
+@@ -478,7 +478,8 @@
+ 	set transmitButton $w.send
+ 	global logoButton
+ 	set logoButton $w.logo
+-
++	global overlayEnabled
++	set overlayEnabled [ yesno overlayEnabled ]
+ 	checkbutton $w.send -text "Transmit" \
+ 		-relief raised -command transmit \
+ 		-anchor w -variable transmitButtonState -font $f \
+@@ -494,9 +495,12 @@
+ 		-relief raised -command logo_transmit \
+ 		-anchor w -variable logoButtonState -font $f \
+ 		-state normal -highlightthickness 0
+-		
+ #	pack $w.send $w.release $w.freeze -fill both
+-	pack $w.send $w.logo $w.release -fill both
++	pack $w.send -fill both
++	if $overlayEnabled {
++		pack $w.logo  -fill both
++	}
++	pack $w.release -fill both
+ }
+ 
+ proc doNothing { args } {
+@@ -1656,7 +1660,8 @@
+ 
+ proc build.xmit w {
+ 	set f [smallfont]
+-
++	global overlayEnabled
++	set overlayEnabled [ yesno overlayEnabled ]
+ 	label $w.label -text Transmission
+ 	frame $w.frame -relief sunken -borderwidth 2
+ 	pack $w.label -fill x
+@@ -1672,8 +1677,9 @@
+ 	build.titlemaker $w.frame.combined.tm
+ 
+ 	pack $w.frame.combined.right -side top -expand 1 -fill x -padx 10 -anchor w
+-	pack $w.frame.combined.tm -side bottom -expand 1 -fill y -pady 10 -anchor w
+-	
++	if $overlayEnabled {
++		pack $w.frame.combined.tm -side bottom -expand 1 -fill y -pady 10 -anchor w
++	}
+ 	pack $w.frame.buttons -side left -padx 6 
+ 	pack $w.frame.combined -side right -expand 1 -fill x -padx 10 -anchor c
+ 
diff --git a/mbone/vic-devel/patches/patch-ui-resource.tcl b/mbone/vic-devel/patches/patch-ui-resource.tcl
new file mode 100644
index 00000000000..b76f084d9da
--- /dev/null
+++ b/mbone/vic-devel/patches/patch-ui-resource.tcl
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui-resource.tcl,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+
+Add option to disable overlay UI
+
+--- tcl/ui-resource.tcl.orig	2008-12-14 12:21:50.000000000 +0000
++++ tcl/ui-resource.tcl	2008-12-14 12:21:55.000000000 +0000
+@@ -237,6 +237,7 @@
+ 	option add Vic.overlayFilename "" startupFile
+ 	option add Vic.overlayX "0" startupFile
+ 	option add Vic.overlayY "0" startupFile
++	option add Vic.overlayEnabled true startupFile
+ 
+ 	# Init fonts
+         if {![string match [ windowingsystem] "aqua"]} {