From nobody@FreeBSD.org  Mon May 19 07:56:42 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2D8F31065681
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2008 07:56:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 16CE88FC21
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2008 07:56:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m4J7tMHk088842
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2008 07:55:22 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m4J7tM8L088841;
	Mon, 19 May 2008 07:55:22 GMT
	(envelope-from nobody)
Message-Id: <200805190755.m4J7tM8L088841@www.freebsd.org>
Date: Mon, 19 May 2008 07:55:22 GMT
From: Angel Carpintero <ack@telefonica.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: multimedia/motion update to 3.2.10
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         123808
>Category:       ports
>Synopsis:       multimedia/motion update to 3.2.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lme
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 19 08:00:03 UTC 2008
>Closed-Date:    Tue May 20 17:33:51 UTC 2008
>Last-Modified:  Tue May 20 17:40:01 UTC 2008
>Originator:     Angel Carpintero
>Release:        6.3-RELEASE-p1
>Organization:
N/A
>Environment:
FreeBSD freebsd.local.house 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Wed Feb 13 02:40:56 UTC 2008     root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
update multimedia/motion port to latest stable version 3.2.10
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- motion/Makefile	2008-01-24 16:56:04.000000000 +0100
+++ motion-3.2.10/Makefile	2008-05-19 09:47:09.000000000 +0200
@@ -2,17 +2,16 @@
 # Date created:				22 Dec 2005
 # Whom:					Angel Carpintero <ack@telefonica.net>
 #
-# $FreeBSD: ports/multimedia/motion/Makefile,v 1.9 2008/01/24 15:56:04 miwi Exp $
+# $FreeBSD:$
 #
 
 PORTNAME=	motion
-PORTVERSION=	3.2.9
-PORTREVISION=	1
+PORTVERSION=	3.2.10
 CATEGORIES=	multimedia
-MASTER_SITES=	SF
+MASTER_SITES=	SF	
 
-PATCH_SITES=	http://www.lavrsen.dk/twiki/pub/Motion/FreeBSDPatch/
-PATCHFILES=	motion-3.2.9-2.port-freebsd.diff.gz
+PATCH_SITES=	http://www.lavrsen.dk/twiki/pub/Motion/FreeBSDPatch/	
+PATCHFILES=	motion-3.2.10.port-freebsd.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ack@telefonica.net
@@ -39,22 +38,31 @@
 EXAMPLES=	motion-dist.conf motion.init-FreeBSD.sh thread1.conf \
 		thread2.conf thread3.conf thread4.conf
 
-OPTIONS=	BKTR "Support for TV Capture cards" on \
+OPTIONS=	PWCBSD "Webcams supported by PWCBSD (this disables BKTR support)" off \
+		BKTR "Support for TV Capture cards" on \
 		LINUXTHREADS "Use LinuxThreads" off
 
 MAKE_ENV+=	CC="${CC}"
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_BKTR)
+.if !defined(WITH_BKTR) && !defined(WITH_PWCBSD)
 CFLAGS+=	-DWITHOUT_V4L
 .endif
 
+.if defined(WITH_PWCBSD)
+CONFIGURE_ARGS= --with-pwcbsd
+BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
+RUN_DEPENDS+= /boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
+.endif
+
 .if defined(WITH_LINUXTHREADS) || ${OSVERSION} < 504000
 CONFIGURE_ARGS=	--with-linuxthreads
 LIB_DEPENDS+=	lthread.[35]:${PORTSDIR}/devel/linuxthreads
 .endif
 
+
+
 post-install:
 .if !exists(${PREFIX}/etc/motion.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/motion.conf.sample ${PREFIX}/etc/motion.conf
@@ -77,4 +85,10 @@
 	@${ECHO_MSG} "==============================================================================="
 .endif
 
+.if defined(WITH_PWCBSD)
+	@${ECHO_MSG} "==============================================================================="
+	@${ECHO_MSG} "Please make sure you have pwcbsd compiled with mmap support."
+	@${ECHO_MSG} "==============================================================================="
+.endif
+
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lme 
Responsible-Changed-By: lme 
Responsible-Changed-When: Mon May 19 20:10:58 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123808 
State-Changed-From-To: open->closed 
State-Changed-By: lme 
State-Changed-When: Tue May 20 17:33:50 UTC 2008 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123808 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123808: commit references a PR
Date: Tue, 20 May 2008 17:33:34 +0000 (UTC)

 lme         2008-05-20 17:33:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/motion    Makefile distinfo pkg-plist 
   Log:
   - Update to 3.2.10
   - Enable support for PWCBSD-based Webcams
   - Install rc-script
   
   PR:             ports/123808
   Submitted by:   Angel Carpintero <ack (AT) telefonica.net>
   
   Revision  Changes    Path
   1.10      +23 -7     ports/multimedia/motion/Makefile
   1.8       +6 -6      ports/multimedia/motion/distinfo
   1.2       +1 -1      ports/multimedia/motion/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
