Index: branches/2020Q4/multimedia/motion/Makefile
===================================================================
--- branches/2020Q4/multimedia/motion/Makefile	(revision 553537)
+++ branches/2020Q4/multimedia/motion/Makefile	(revision 553538)
@@ -1,108 +1,117 @@
 # Created by: Angel Carpintero <ack@telefonica.net>
 # $FreeBSD$
 
+# PORTNAME block
 PORTNAME=	motion
-PORTVERSION=	4.3.1
+PORTVERSION=	4.3.2
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	multimedia
 
+# Maintainer block
 MAINTAINER=	ports@blievers.net
 COMMENT=	Motion detection application
 
+# License block
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
+# Dependencies
 LIB_DEPENDS=	libwebp.so:graphics/webp \
 		libmicrohttpd.so:www/libmicrohttpd
 
+# USES block
 USES=		autoreconf gmake jpeg localbase pkgconfig gettext
 
+KMODDIR?=	/boot/modules
+.if ${KMODDIR} == /boot/kernel
+KMODDIR=	/boot/modules
+.endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	Motion-Project
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-linuxthreads \
 		--without-jpeg-mmx
 
-KMODDIR?=	/boot/modules
-.if ${KMODDIR} == /boot/kernel
-KMODDIR=	/boot/modules
-.endif
-
+# Standard bsd.port.mk variables
 SUB_FILES=	pkg-message
 
+# Packaging list block
 PLIST_FILES=	bin/motion \
 		man/man1/motion.1.gz \
 		"@sample ${ETCDIR}/motion.conf.sample" \
 		"@dir ${ETCDIR}/conf.d"
 PORTDOCS=	*
 
 PORTEXAMPLES=	camera1-dist.conf camera2-dist.conf \
 		camera3-dist.conf camera4-dist.conf
 
+# Options definitions
 OPTIONS_DEFINE=		DOCS EXAMPLES FFMPEG MYSQL PGSQL SQLITE3
+OPTIONS_DEFAULT=	WEBCAMD FFMPEG
 OPTIONS_RADIO=		VIDEO
 OPTIONS_RADIO_VIDEO=	BKTR PWCBSD WEBCAMD
-OPTIONS_DEFAULT=	WEBCAMD 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
 
+VIDEO_DESC=		Video capture driver (Netcam support only if none selected)
 WEBCAMD_DESC=		Webcams using webcamd
-WEBCAMD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
-#  note: all configure --with-pwcbsd does is not shut off v4l support
-WEBCAMD_CONFIGURE_WITH=	pwcbsd
 
+BKTR_CONFIGURE_WITH=	bktr
 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
 
+PWCBSD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
+PWCBSD_RUN_DEPENDS=	${KMODDIR}/pwc.ko:multimedia/pwcbsd
+PWCBSD_CONFIGURE_WITH=	pwcbsd
+
 SQLITE3_USES=		sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
+
+WEBCAMD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
+#  note: all configure --with-pwcbsd does is not shut off v4l support
+WEBCAMD_CONFIGURE_WITH=	pwcbsd
 
 .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}/data/motion-dist.conf.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/motion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	${INSTALL_DATA} ${WRKSRC}/data/motion-dist.conf \
 		${STAGEDIR}${ETCDIR}/motion.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/data/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4/multimedia/motion/distinfo
===================================================================
--- branches/2020Q4/multimedia/motion/distinfo	(revision 553537)
+++ branches/2020Q4/multimedia/motion/distinfo	(revision 553538)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587178233
-SHA256 (Motion-Project-motion-release-4.3.1_GH0.tar.gz) = 545712b10fc4a0134e994b7d8a3773c1c22f0bf4bd7afea7d7ffff357aca9ea5
-SIZE (Motion-Project-motion-release-4.3.1_GH0.tar.gz) = 849633
+TIMESTAMP = 1603754625
+SHA256 (Motion-Project-motion-release-4.3.2_GH0.tar.gz) = dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70
+SIZE (Motion-Project-motion-release-4.3.2_GH0.tar.gz) = 849378
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 553537)
+++ branches/2020Q4	(revision 553538)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r553525