Index: branches/2017Q3/multimedia/motion/Makefile
===================================================================
--- branches/2017Q3/multimedia/motion/Makefile	(revision 448192)
+++ branches/2017Q3/multimedia/motion/Makefile	(revision 448193)
@@ -1,104 +1,104 @@
 # Created by: Angel Carpintero <ack@telefonica.net>
 # $FreeBSD$
 
 PORTNAME=	motion
 PORTVERSION=	4.0.1
-PORTREVISION=	3
 DISTVERSIONPREFIX=	release-
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Motion detection application
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf gmake jpeg localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	Motion-Project
+USE_RC_SUBR=	${PORTNAME}
 
-USES=		autoreconf gmake jpeg localbase pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-linuxthreads \
 		--without-jpeg-mmx
 
 KMODDIR?=	/boot/modules
 .if ${KMODDIR} == /boot/kernel
 KMODDIR=	/boot/modules
 .endif
 
-USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/motion \
 		man/man1/motion.1.gz \
 		"@sample ${ETCDIR}/motion.conf.sample" \
 		"@dir ${ETCDIR}/conf.d"
 PORTDOCS=	CHANGELOG CREDITS README.md README.FreeBSD \
 		motion_guide.html mask1.png normal.jpg \
 		outputmotion1.jpg outputnormal1.jpg
 PORTEXAMPLES=	camera1-dist.conf camera2-dist.conf \
 		camera3-dist.conf camera4-dist.conf
 
 OPTIONS_DEFINE=		DOCS EXAMPLES FFMPEG MYSQL PGSQL SQLITE3
 OPTIONS_RADIO=		VIDEO
 OPTIONS_RADIO_VIDEO=	BKTR PWCBSD
 OPTIONS_DEFAULT=	BKTR FFMPEG
 VIDEO_DESC=		Video capture driver (Netcam support only if none selected)
 
 BKTR_DESC=		BKTR based TV capture cards
 BKTR_CONFIGURE_WITH=	bktr
 
 PWCBSD_DESC=		PWCBSD based Webcams
 PWCBSD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
 PWCBSD_RUN_DEPENDS=	${KMODDIR}/pwc.ko:multimedia/pwcbsd
 PWCBSD_CONFIGURE_WITH=	pwcbsd
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg=${LOCALBASE}
 FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 			--with-mysql-include=${LOCALBASE}/include/mysql
 MYSQL_CONFIGURE_OFF=	--without-mysql
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql-lib=${LOCALBASE}/lib \
 			--with-pgsql-include=${LOCALBASE}/include
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 
 SQLITE3_USES=		sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 .include <bsd.port.pre.mk>
 
 .if ${JPEG_PORT} == "graphics/jpeg-turbo"
 CONFIGURE_ARGS+=	--with-jpeg-turbo=${LOCALBASE}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure.ac
 # Fix pidfile path
 	@${REINPLACE_CMD} -e \
 		's|/run/motion|/run|' ${WRKSRC}/motion-dist.conf.in
 # Fix warnings about mismatched format specifiers (Fixed upstream in dbd7282)
 	@${REINPLACE_CMD} -e \
 		's|%hd|%d|g;s|%hu|%u|g;s|%Zu|%zu|g' ${WRKSRC}/webhttpd.c ${WRKSRC}/stream.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/motion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	${INSTALL_DATA} ${WRKSRC}/motion-dist.conf \
 		${STAGEDIR}${ETCDIR}/motion.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: branches/2017Q3/multimedia/motion/files/patch-video2.c
===================================================================
--- branches/2017Q3/multimedia/motion/files/patch-video2.c	(nonexistent)
+++ branches/2017Q3/multimedia/motion/files/patch-video2.c	(revision 448193)
@@ -0,0 +1,11 @@
+--- video2.c.orig	2017-08-11 20:05:27 UTC
++++ video2.c
+@@ -184,7 +184,7 @@ typedef struct {
+ /**
+  * xioctl
+  */
+-#ifdef __OpenBSD__
++#if defined (__OpenBSD__) || defined (__FreeBSD__)
+ static int xioctl(src_v4l2_t *vid_source, unsigned long request, void *arg)
+ #else
+ static int xioctl(src_v4l2_t *vid_source, int request, void *arg)

Property changes on: branches/2017Q3/multimedia/motion/files/patch-video2.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 448192)
+++ branches/2017Q3	(revision 448193)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r447919