From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 11 17:03:16 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 79672C71;
 Mon, 11 Mar 2013 17:03:16 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 53144C8;
 Mon, 11 Mar 2013 17:03:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BH3Fx8016708;
 Mon, 11 Mar 2013 17:03:15 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2BH3Fsu016707;
 Mon, 11 Mar 2013 17:03:15 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201303111703.r2BH3Fsu016707@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Mon, 11 Mar 2013 17:03:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313919 - head/multimedia/motion
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Mar 2013 17:03:16 -0000

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@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}