svn commit: r313919 - head/multimedia/motion

[Matthias Andree]

Author: mandree
Date: Mon Mar 11 17:03:15 2013
New Revision: 313919
URL: http://svnweb.freebsd.org/changeset/ports/313919

Log:
  Fix an issue with bktr.
  
  PR:		ports/173750
  Submitted by:	c.petrik.sosa at gmail.com (maintainer)

Modified:
  head/multimedia/motion/Makefile   (contents, props changed)

Modified: head/multimedia/motion/Makefile
==============================================================================
--- head/multimedia/motion/Makefile	Mon Mar 11 16:42:16 2013	(r313918)
+++ head/multimedia/motion/Makefile	Mon Mar 11 17:03:15 2013	(r313919)
@@ -3,6 +3,7 @@
 
 PORTNAME=	motion
 PORTVERSION=	3.2.12
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20${PORTVERSION:R}/${PORTVERSION}
 
@@ -13,10 +14,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
-OPTIONS_DEFINE=	VIDEO LTHREAD FFMPEG MYSQL PGSQL DOCS EXAMPLES
+OPTIONS_DEFINE=	LTHREAD FFMPEG MYSQL PGSQL DOCS EXAMPLES
 OPTIONS_SINGLE=	VIDEO
 OPTIONS_SINGLE_VIDEO=	BKTR PWCBSD
-OPTIONS_DEFAULT=	VIDEO BKTR FFMPEG
+OPTIONS_DEFAULT=	BKTR FFMPEG
 VIDEO_DESC=	Video capture driver. Choose one of BKTR or PWCBSD
 BKTR_DESC=	BKTR based TV capture cards
 PWCBSD_DESC=	PWCBSD based Webcams
@@ -39,6 +40,7 @@ PORTEXAMPLES=	motion-dist.conf thread1.c
 
 .if ${PORT_OPTIONS:MBKTR}
 CONFIGURE_ARGS+=--with-bktr
+CFLAGS+=	-DWITHOUT_V4L
 .else
 CONFIGURE_ARGS+=--without-bktr
 .endif
@@ -47,9 +49,9 @@ CONFIGURE_ARGS+=--without-bktr
 BUILD_DEPENDS+=	v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
 RUN_DEPENDS+=	/boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
 CONFIGURE_ARGS+=--with-pwcbsd
+CFLAGS+=	-DWITHOUT_V4L
 .else
 CONFIGURE_ARGS+=--without-pwcbsd
-CFLAGS+=	-DWITHOUT_V4L
 .endif
 
 .if ${PORT_OPTIONS:MLTHREAD}