Index: head/multimedia/spook/Makefile
===================================================================
--- head/multimedia/spook/Makefile	(revision 390777)
+++ head/multimedia/spook/Makefile	(revision 390778)
@@ -1,58 +1,60 @@
 # Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	spook
 PORTVERSION=	20050207
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.litech.org/spook/dist/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mizhka@gmail.com
 COMMENT=	Embedded RTP/RTSP/HTTP video streamer
 
+LICENSE=	GPLv2
+
 # TODO: FireWire IIDC support (needs libraw1394, libdc1394).
 # TODO: Test with Luigi-ified V4L input drivers e.g. pwc, etc.
-
 OPTIONS_DEFINE=	JPEG MPEG4 V4L DOCS
-OPTIONS_DEFAULT=	JPEG V4L
+OPTIONS_DEFAULT=	MPEG4 V4L
 
 MPEG4_DESC=	MPEG4 encoding support
 V4L_DESC=	V4L input support
 
 USES=		autoreconf tar:bzip2 gmake
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/spook bin/spookctl etc/spook.conf.dist
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJPEG}
-USES+=			jpeg
+USES+=		jpeg
 CONFIGURE_ARGS+=	--enable-encoder-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MMPEG4}
 LIB_DEPENDS+=		libxvidcore.so:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--enable-encoder-mpeg4
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-CONFIGURE_ARGS+=	--enable-input-v4l
+LIB_DEPENDS+=		libv4l1.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+CONFIGURE_ARGS+=	--enable-input-v4l2 --enable-input-v4l
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/spook ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/spookctl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/spook.conf.dist ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
Index: head/multimedia/spook/files/patch-bswap.h
===================================================================
--- head/multimedia/spook/files/patch-bswap.h	(revision 390777)
+++ head/multimedia/spook/files/patch-bswap.h	(revision 390778)
@@ -1,14 +1,14 @@
---- bswap.h.orig	2008-09-02 14:40:15.000000000 +0100
-+++ bswap.h	2008-09-02 14:41:51.000000000 +0100
+--- bswap.h.orig	2005-02-08 02:20:14 UTC
++++ bswap.h
 @@ -6,7 +6,11 @@
  #ifndef __BSWAP_H__
  #define __BSWAP_H__
  
 +#ifdef __FreeBSD__
 +#include <sys/endian.h>
 +#else
  #include <endian.h>
 +#endif
  #if __BYTE_ORDER == __BIG_ENDIAN
  #define WORDS_BIGENDIAN
  #endif
Index: head/multimedia/spook/files/patch-configure.ac
===================================================================
--- head/multimedia/spook/files/patch-configure.ac	(revision 390777)
+++ head/multimedia/spook/files/patch-configure.ac	(revision 390778)
@@ -1,11 +1,19 @@
---- configure.ac.orig	2008-09-02 14:40:15.000000000 +0100
-+++ configure.ac	2008-09-02 14:41:51.000000000 +0100
-@@ -55,7 +55,7 @@
+--- configure.ac.orig	2005-02-08 02:23:54 UTC
++++ configure.ac
+@@ -55,7 +55,7 @@ AC_ARG_ENABLE(encoder-jpeg,
  	[enable_encoder_jpeg=auto])
  
  case $host in
 -	*-*-linux*)
 +	*-*-linux*|*freebsd*)
  		if test x$enable_input_vdig = xyes; then
  			AC_MSG_ERROR([QuickTime digitizer support is only available on Mac OS X])
  		fi
+@@ -116,6 +116,7 @@ if test x$enable_input_v4l != xno; then
+ 		]]),
+ 	[
+ 		AC_MSG_RESULT(yes)
++		LIBS="-lv4l1 $LIBS"
+ 		build_input_v4l=true
+ 		AC_MSG_CHECKING([for pwc-ioctl.h in the kernel source tree])
+ 		if test -d $linux_source/drivers/usb/media; then
Index: head/multimedia/spook/files/patch-input-oss.c
===================================================================
--- head/multimedia/spook/files/patch-input-oss.c	(revision 390777)
+++ head/multimedia/spook/files/patch-input-oss.c	(revision 390778)
@@ -1,14 +1,14 @@
---- input-oss.c.orig	2008-09-02 14:40:15.000000000 +0100
-+++ input-oss.c	2008-09-02 14:41:52.000000000 +0100
+--- input-oss.c.orig	2004-12-06 05:58:04 UTC
++++ input-oss.c
 @@ -28,7 +28,11 @@
  #include <errno.h>
  #include <pthread.h>
  
 +#ifdef __FreeBSD__
 +#include <sys/soundcard.h>
 +#else
  #include <linux/soundcard.h>
 +#endif
  
  #include <event.h>
  #include <log.h>
Index: head/multimedia/spook/files/patch-md5.c
===================================================================
--- head/multimedia/spook/files/patch-md5.c	(revision 390777)
+++ head/multimedia/spook/files/patch-md5.c	(revision 390778)
@@ -1,14 +1,14 @@
---- md5.c.orig	2008-09-02 14:40:15.000000000 +0100
-+++ md5.c	2008-09-02 14:41:52.000000000 +0100
+--- md5.c.orig	2004-12-09 18:09:09 UTC
++++ md5.c
 @@ -21,7 +21,11 @@
  #include <string.h>
  #include <sys/types.h>
  
 +#ifdef __FreeBSD__
 +#include <machine/endian.h>
 +#else
  #include <endian.h>
 +#endif
  #if __BYTE_ORDER == __BIG_ENDIAN
  #define WORDS_BIGENDIAN
  #endif
Index: head/multimedia/spook/files/patch-tcp.c
===================================================================
--- head/multimedia/spook/files/patch-tcp.c	(revision 390777)
+++ head/multimedia/spook/files/patch-tcp.c	(revision 390778)
@@ -1,11 +1,11 @@
---- tcp.c.orig	2008-09-02 14:40:15.000000000 +0100
-+++ tcp.c	2008-09-02 14:41:53.000000000 +0100
-@@ -454,7 +454,7 @@
+--- tcp.c.orig	2004-12-29 02:33:21 UTC
++++ tcp.c
+@@ -454,7 +454,7 @@ static void do_accept( struct event_info
  				strerror( errno ) );
  
  	i = 1;
 -	if( setsockopt( fd, SOL_TCP, TCP_NODELAY, &i, sizeof( i ) ) < 0 )
 +	if( setsockopt( fd, IPPROTO_TCP, TCP_NODELAY, &i, sizeof( i ) ) < 0 )
  		spook_log( SL_INFO, "error setting TCP_NODELAY on socket: %s",
  				strerror( errno ) );