Improve zoneminder ports:

 - add patch to make it compile with a recent clang (from -current)
 - add missing fcgiwrap config option to the FreeBSD readme
 - sync pkg-descr and highlight difference between the ports in pkg-descr and COMMENT

Approved by:	maintainer

9 files changed, 50 insertions, 8 deletions

diff --git a/multimedia/zoneminder-h264/Makefile b/multimedia/zoneminder-h264/Makefile
index 886a0e377197..91b08831dc62 100644
--- a/multimedia/zoneminder-h264/Makefile
+++ b/multimedia/zoneminder-h264/Makefile
@@ -2,11 +2,11 @@
 
 PORTNAME=	zoneminder-h264
 PORTVERSION=	1.30.20170222
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	bsd@abinet.ru
-COMMENT=	Complete security camera solution, fully web based with image analysis
+COMMENT=	Complete security camera solution, fully web based with image analysis, experimental h264 version
 
 LICENSE=	GPLv2
 
diff --git a/multimedia/zoneminder-h264/files/README.FreeBSD b/multimedia/zoneminder-h264/files/README.FreeBSD
index 97ab58fdb0a8..0a4c888a2608 100644
--- a/multimedia/zoneminder-h264/files/README.FreeBSD
+++ b/multimedia/zoneminder-h264/files/README.FreeBSD
@@ -82,6 +82,7 @@ the same server.
 	Enable and start FcgiWrap
 		sysrc fcgiwrap_enable="YES"
 		sysrc fcgiwrap_user="www"
+		sysrc fcgiwrap_socket_owner="www"
 		sysrc fcgiwrap_flags="-c 4"
 
 1.4 PHP is installed as a dependency to ZoneMinder. However, you should 
diff --git a/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp b/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp
new file mode 100644
index 000000000000..b36333a57371
--- /dev/null
+++ b/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp
@@ -0,0 +1,11 @@
+--- src/zm_stream.cpp.orig	2017-05-09 14:54:48 UTC
++++ src/zm_stream.cpp
+@@ -332,7 +332,7 @@ void StreamBase::openComms()
+ 
+     strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
+     loc_addr.sun_family = AF_UNIX;
+-    if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
++    if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
+     {
+       Fatal( "Can't bind: %s", strerror(errno) );
+     }
diff --git a/multimedia/zoneminder-h264/files/patch-src_zmf.cpp b/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
index fd6b5f6b55e0..874c1a595348 100644
--- a/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
+++ b/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
@@ -1,5 +1,14 @@
---- src/zmf.cpp.orig	2016-11-03 20:26:18 UTC
+--- src/zmf.cpp.orig	2017-05-09 14:54:48 UTC
 +++ src/zmf.cpp
+@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
+   strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+   addr.sun_family = AF_UNIX;
+ 
+-  if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
++  if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+   {
+     Error( "Can't bind: %s", strerror(errno) );
+     exit( -1 );
 @@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
      Debug( 1, "Got image, writing to %s", path );
  
diff --git a/multimedia/zoneminder-h264/pkg-descr b/multimedia/zoneminder-h264/pkg-descr
index ea12cfbda304..c136c32fdd63 100644
--- a/multimedia/zoneminder-h264/pkg-descr
+++ b/multimedia/zoneminder-h264/pkg-descr
@@ -1,5 +1,5 @@
-Zoneminder is an all-in-one GPL'd security and surveillance camera
-solution. Fully web-based system for viewing and analyzing security
-camera feeds. This version has H.264 support.
+Zoneminder is an all-in-one GPL'd security and surveillance camera solution.
+Fully web-based system for viewing and analyzing security camera feeds.
+This is an experimental version which has H.264 support.
 
 WWW: http://www.zoneminder.com/
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 6561171bf80c..58e67c838c68 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zoneminder
 PORTVERSION=	1.30.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	bsd@abinet.ru
diff --git a/multimedia/zoneminder/files/README.FreeBSD b/multimedia/zoneminder/files/README.FreeBSD
index 97ab58fdb0a8..0a4c888a2608 100644
--- a/multimedia/zoneminder/files/README.FreeBSD
+++ b/multimedia/zoneminder/files/README.FreeBSD
@@ -82,6 +82,7 @@ the same server.
 	Enable and start FcgiWrap
 		sysrc fcgiwrap_enable="YES"
 		sysrc fcgiwrap_user="www"
+		sysrc fcgiwrap_socket_owner="www"
 		sysrc fcgiwrap_flags="-c 4"
 
 1.4 PHP is installed as a dependency to ZoneMinder. However, you should 
diff --git a/multimedia/zoneminder/files/patch-src_zm__stream.cpp b/multimedia/zoneminder/files/patch-src_zm__stream.cpp
new file mode 100644
index 000000000000..b36333a57371
--- /dev/null
+++ b/multimedia/zoneminder/files/patch-src_zm__stream.cpp
@@ -0,0 +1,11 @@
+--- src/zm_stream.cpp.orig	2017-05-09 14:54:48 UTC
++++ src/zm_stream.cpp
+@@ -332,7 +332,7 @@ void StreamBase::openComms()
+ 
+     strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
+     loc_addr.sun_family = AF_UNIX;
+-    if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
++    if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
+     {
+       Fatal( "Can't bind: %s", strerror(errno) );
+     }
diff --git a/multimedia/zoneminder/files/patch-src_zmf.cpp b/multimedia/zoneminder/files/patch-src_zmf.cpp
index e2b736ba06d3..874c1a595348 100644
--- a/multimedia/zoneminder/files/patch-src_zmf.cpp
+++ b/multimedia/zoneminder/files/patch-src_zmf.cpp
@@ -1,5 +1,14 @@
---- src/zmf.cpp.orig	2016-07-28 01:45:26 UTC
+--- src/zmf.cpp.orig	2017-05-09 14:54:48 UTC
 +++ src/zmf.cpp
+@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
+   strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+   addr.sun_family = AF_UNIX;
+ 
+-  if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
++  if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+   {
+     Error( "Can't bind: %s", strerror(errno) );
+     exit( -1 );
 @@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
      Debug( 1, "Got image, writing to %s", path );