--- /usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile	2017-01-11 10:08:38.000000000 +0000
+++ /usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile	2017-02-03 20:06:34.559978000 +0000
@@ -3,7 +3,7 @@ 
 PORTNAME=	zoneminder
 PORTVERSION=	1.30.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	bsd@abinet.ru
@@ -11,6 +11,8 @@ 
 
 LICENSE=	GPLv2
 
+CONFLICTS=	zoneminder-h264
+
 ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
 		p5-Date-Manip>=0:devel/p5-Date-Manip \
@@ -27,6 +29,7 @@ 
 BUILD_DEPENDS=	${ZM_DEPENDS}
 RUN_DEPENDS=	${ZM_DEPENDS} \
 		sudo:security/sudo \
+		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
 		zip:archivers/zip
 
 USE_GITHUB=	yes
@@ -35,7 +38,7 @@ 
 
 USES=		cmake jpeg mysql perl5 php shebangfix ssl
 USE_RC_SUBR=	zoneminder
-USE_PHP=	json pdo_mysql session gd sockets
+USE_PHP=	json pdo_mysql session gd sockets ctype
 
 ONLY_FOR_ARCHS=	amd64 i386
 
--- /usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zm__monitor.cpp	1970-01-01 00:00:00.000000000 +0000
+++ /usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zm__monitor.cpp	2017-02-03 16:50:10.802657000 +0000
@@ -0,0 +1,38 @@ 
+--- src/zm_monitor.cpp.orig	2016-07-28 01:45:26 UTC
++++ src/zm_monitor.cpp
+@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()
+       return( false );
+     }
+     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
+-    if ( mem_ptr < 0 )
++    if ( mem_ptr < (void *)0 )
+     {
+       Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
+       connected = false;
+@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
+     connected = false;
+ 
+ #if ZM_MEM_MAPPED
+-    if ( mem_ptr > 0 )
++    if ( mem_ptr > (void *)0 )
+     {
+       msync( mem_ptr, mem_size, MS_ASYNC );
+       munmap( mem_ptr, mem_size );
+@@ -222,7 +222,7 @@ bool Monitor::MonitorLink::disconnect()
+       }
+     }
+ 
+-    if ( shmdt( mem_ptr ) < 0 )
++    if ( shmdt( mem_ptr ) < (void *)0 )
+     {
+       Debug( 3, "Can't shmdt: %s", strerror(errno) );
+       return( false );
+@@ -558,7 +558,7 @@ bool Monitor::connect() {
+     exit( -1 );
+   }
+   mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
+-  if ( mem_ptr < 0 )
++  if ( mem_ptr < (void *)0 )
+   {
+     Error( "Can't shmat: %s", strerror(errno));
+     exit( -1 );
--- /usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zmf.cpp	1970-01-01 00:00:00.000000000 +0000
+++ /usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zmf.cpp	2017-02-03 16:49:48.052412000 +0000
@@ -0,0 +1,11 @@ 
+--- src/zmf.cpp.orig	2016-07-28 01:45:26 UTC
++++ src/zmf.cpp
+@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
+     Debug( 1, "Got image, writing to %s", path );
+ 
+     FILE *fd = 0;
+-    if ( (fd = fopen( path, "w" )) < 0 )
++    if ( (fd = fopen( path, "w" )) < (void *)0 )
+     {
+       Error( "Can't fopen '%s': %s", path, strerror(errno) );
+       exit( -1 );