Update ZoneMinder from 1.25.0 to 1.28.1.

Numerous changes, documented at:
 https://github.com/ZoneMinder/ZoneMinder/releases

Addresses two security advisories:

  https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0
  http://secunia.com/advisories/62918/

Pkgsrc changes:

patch-src_zm_signal_h is no longer necessary because zm_signal.h uses
HAVE_EXECINFO_H.

patch-src_zmf_cpp appears to be applied upstream.

patch-configure_ac no longer needs to set PATH_BUILD to
PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build
scripts as installed files.  Upstream has now implemented this via the
ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory.

src/Makefile.am no longer setuid's zmfix, as zmfix was removed from
ZoneMinder 1.26.6.

The code now uses clock_gettime(), which on some systems (like Linux), calls
for -lrt.  Since the build system isn't aware of this, but Pkgsrc is, just set
PTHREAD_AUTO_VARS=yes.

The PHP code now uses PDO for DB access, but it looks like there are some
straggling dependencies on the raw MySQL driver, so both are pulled in.

15 files changed, 394 insertions, 248 deletions

diff --git a/security/zoneminder/MESSAGE b/security/zoneminder/MESSAGE
index 4b46bc53333..d0995f10f66 100644
--- a/security/zoneminder/MESSAGE
+++ b/security/zoneminder/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/03/15 02:56:56 dsainty Exp $
+$NetBSD: MESSAGE,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
 All documentation for ZoneMinder is now online at:
 
@@ -43,8 +43,9 @@ To enable the web interface via Apache, add the following line to httpd.conf:
 
   Include ${PREFIX}/share/examples/zoneminder/apache/zoneminder.conf
 
-Also follow the configuration instructions for www/ap-php and
-databases/php-mysql packages.  Use pkg_info to read their MESSAGE files.
+Also follow the configuration instructions for www/ap-php,
+databases/php-mysql, databases/php-pdo and databases/php-pdo_mysql packages.
+Use pkg_info to read their MESSAGE files.
 
 PHP may log warnings if the PHP date.timezone configuration is not set.
 Consider assigning a default system time zone to date.timezone in
diff --git a/security/zoneminder/Makefile b/security/zoneminder/Makefile
index 546d80977ef..64b1abd4858 100644
--- a/security/zoneminder/Makefile
+++ b/security/zoneminder/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2014/09/08 21:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/04/05 08:51:08 dsainty Exp $
 
-DISTNAME=	ZoneMinder-1.25.0
 PKGNAME=	${DISTNAME:S/ZoneMinder-/zoneminder-/}
-PKGREVISION=	9
+DISTNAME=	ZoneMinder-1.28.1
 CATEGORIES=	security
-MASTER_SITES=	http://www2.zoneminder.com/downloads/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ZoneMinder/}
+GITHUB_PROJECT=	ZoneMinder
+GITHUB_TYPE=	tag
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://www.zoneminder.com/
@@ -55,6 +57,13 @@ CONFIGURE_ARGS+=	--with-cgidir=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
+# PolicyKit doesn't actually seem to be necessary.  This hack disables
+# configure's hunt for PolicyKit, but has no other apparent ill effects.
+CONFIGURE_ENV+=		POLKIT_CFLAGS=" " POLKIT_LIBS=" "
+
+PTHREAD_AUTO_VARS=	yes
+.include "../../mk/pthread.buildlink3.mk"
+
 CONFIGURE_ENV+=		OPT_NETPBM=yes
 CONFIGURE_ENV+=		PATH_NETPBM=${PREFIX}/bin/pnmscale
 
@@ -80,8 +89,10 @@ CFLAGS+=		-D__STDC_CONSTANT_MACROS
 # gnutls.
 CONFIGURE_ENV+=		ZM_SSL_LIB=openssl
 
-# Control where run-time state (PID file) gets stored.
-CONFIGURE_ENV+=		ZM_RUNDIR=${VARBASE}/run
+# Control where run-time state (PID file and sockets) get stored.
+# Default is "/var/run/zm", but we want to conform to VARBASE.
+CONFIGURE_ENV+=		ZM_RUNDIR=${VARBASE}/run/zm
+CONFIGURE_ENV+=		ZM_SOCKDIR=${VARBASE}/run/zm
 
 .if !empty(PKG_OPTIONS:Mapache)
 .include "../../mk/apache.mk"
@@ -101,6 +112,7 @@ CONFIGURE_ARGS+=	--with-webgroup=${APACHE_GROUP}
 .include "../../lang/php/phpversion.mk"
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-[0-9]*:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 .endif
 
 # This directory contains state, so use OWN_DIRS instead of MAKE_DIRS.
diff --git a/security/zoneminder/PLIST b/security/zoneminder/PLIST
index 1158b2c70e6..ca5b0d3153c 100644
--- a/security/zoneminder/PLIST
+++ b/security/zoneminder/PLIST
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/06 15:07:40 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/05 08:51:08 dsainty Exp $
 bin/zma
 bin/zmaudit.pl
 bin/zmc
+bin/zmcamtool.pl
 bin/zmcontrol.pl
 bin/zmdc.pl
 bin/zmf
 bin/zmfilter.pl
-bin/zmfix
 bin/zmpkg.pl
 bin/zmstreamer
+bin/zmsystemctl.pl
 bin/zmtrack.pl
 bin/zmtrigger.pl
 bin/zmu
@@ -21,6 +22,82 @@ ${ZM_HTTPD_CGIBIN}/zms
 ${PLIST.rcd}share/examples/rc.d/zoneminder
 share/examples/zoneminder/apache/zoneminder.conf
 share/examples/zoneminder/config/zm.conf
+${PERL5_SUB_INSTALLVENDORARCH}/auto/ZoneMinder/.packlist
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Base.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/ConfigAdmin.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/ConfigData.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Config.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/AxisV2.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/FI8608W_Y2k.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/FI8620_Y2k.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/FI8908W.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/FI9821W_Y2k.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/LoftekSentinel.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/M8640.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/mjpgStreamer.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/Ncs370.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/PanasonicIP.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/PelcoD.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/PelcoP.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/SkyIPCam7xx.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/Toshiba_IK_WB11A.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/TVIP862.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/Visca.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Control/Wanscam.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Database.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/General.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/General.pm.orig
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Logger.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Memory/Mapped.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Memory.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Memory/Shared.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/File.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/Handle.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/Inet.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/Serial.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/Spawning.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Channel/Unix.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Connection/Example.pm
+${PERL5_SUB_INSTALLVENDORLIB}/ZoneMinder/Trigger/Connection.pm
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Base.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Config.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::ConfigAdmin.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::ConfigData.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::AxisV2.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::FI8608W_Y2k.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::FI8620_Y2k.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::FI8908W.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::FI9821W_Y2k.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::M8640.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::mjpgStreamer.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::Ncs370.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::PanasonicIP.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::PelcoD.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::PelcoP.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::SkyIPCam7xx.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::Toshiba_IK_WB11A.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::TVIP862.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::Visca.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Control::Wanscam.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Database.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::General.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Logger.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Memory.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::File.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::Handle.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::Inet.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::Serial.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::Spawning.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Channel::Unix.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Connection.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Connection::Example.3
+share/zoneminder/db/test.monitor.sql
 share/zoneminder/db/zm_create.sql
 share/zoneminder/db/zm_update-0.0.1.sql
 share/zoneminder/db/zm_update-0.9.10.sql
@@ -62,6 +139,15 @@ share/zoneminder/db/zm_update-1.24.1.sql
 share/zoneminder/db/zm_update-1.24.2.sql
 share/zoneminder/db/zm_update-1.24.3.sql
 share/zoneminder/db/zm_update-1.24.4.sql
+share/zoneminder/db/zm_update-1.26.0.sql
+share/zoneminder/db/zm_update-1.26.1.sql
+share/zoneminder/db/zm_update-1.26.2.sql
+share/zoneminder/db/zm_update-1.26.3.sql
+share/zoneminder/db/zm_update-1.26.5.sql
+share/zoneminder/db/zm_update-1.27.0.sql
+share/zoneminder/db/zm_update-1.27.99.0.sql
+share/zoneminder/db/zm_update-1.28.0.sql
+share/zoneminder/db/zm_update-1.28.1.sql
 ${ZM_HTTPD_ROOT}/ajax/alarm.php
 ${ZM_HTTPD_ROOT}/ajax/control.php
 ${ZM_HTTPD_ROOT}/ajax/event.php
@@ -218,7 +304,7 @@ ${ZM_HTTPD_ROOT}/skins/classic/views/js/monitorprobe.js
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/montage.js
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/montage.js.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/options.js.php
-${ZM_HTTPD_ROOT}/skins/classic/views/js/postlogin.js
+${ZM_HTTPD_ROOT}/skins/classic/views/js/postlogin.js.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/state.js
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/state.js.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/js/timeline.js
@@ -254,6 +340,152 @@ ${ZM_HTTPD_ROOT}/skins/classic/views/video.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/watch.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/zone.php
 ${ZM_HTTPD_ROOT}/skins/classic/views/zones.php
+${ZM_HTTPD_ROOT}/skins/flat/css/control.css
+${ZM_HTTPD_ROOT}/skins/flat/css/export.css
+${ZM_HTTPD_ROOT}/skins/flat/css/skin.css
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-d.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-dl.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-dr.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-l-d.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-l-u.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-l.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-r.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-s-d.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-s-u.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-u.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-ul.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/arrow-ur.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/center.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/point-g.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/point-o.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/point-r.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/seq-d.gif
+${ZM_HTTPD_ROOT}/skins/flat/graphics/seq-u.gif
+${ZM_HTTPD_ROOT}/skins/flat/includes/config.php
+${ZM_HTTPD_ROOT}/skins/flat/includes/control_functions.php
+${ZM_HTTPD_ROOT}/skins/flat/includes/export_functions.php
+${ZM_HTTPD_ROOT}/skins/flat/includes/functions.php
+${ZM_HTTPD_ROOT}/skins/flat/includes/init.php
+${ZM_HTTPD_ROOT}/skins/flat/includes/timeline_functions.php
+${ZM_HTTPD_ROOT}/skins/flat/js/skin.js
+${ZM_HTTPD_ROOT}/skins/flat/js/skin.js.php
+${ZM_HTTPD_ROOT}/skins/flat/skin.php
+${ZM_HTTPD_ROOT}/skins/flat/views/Makefile.am
+${ZM_HTTPD_ROOT}/skins/flat/views/bandwidth.php
+${ZM_HTTPD_ROOT}/skins/flat/views/blank.php
+${ZM_HTTPD_ROOT}/skins/flat/views/console.php
+${ZM_HTTPD_ROOT}/skins/flat/views/control.php
+${ZM_HTTPD_ROOT}/skins/flat/views/controlcap.php
+${ZM_HTTPD_ROOT}/skins/flat/views/controlcaps.php
+${ZM_HTTPD_ROOT}/skins/flat/views/controlpreset.php
+${ZM_HTTPD_ROOT}/skins/flat/views/css/console.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/control.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/controlcaps.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/devices.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/event.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/events.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/export.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/filter.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/frame.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/frames.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/groups.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/log.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/monitor.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage_2wide.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage_3wide.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage_3wide50enlarge.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage_4wide.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/montage_freeform.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/options.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/stats.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/timeline.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/timeline.css.php
+${ZM_HTTPD_ROOT}/skins/flat/views/css/video.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/watch.css
+${ZM_HTTPD_ROOT}/skins/flat/views/css/zone.css
+${ZM_HTTPD_ROOT}/skins/flat/views/cycle.php
+${ZM_HTTPD_ROOT}/skins/flat/views/device.php
+${ZM_HTTPD_ROOT}/skins/flat/views/devices.php
+${ZM_HTTPD_ROOT}/skins/flat/views/donate.php
+${ZM_HTTPD_ROOT}/skins/flat/views/error.php
+${ZM_HTTPD_ROOT}/skins/flat/views/event.php
+${ZM_HTTPD_ROOT}/skins/flat/views/eventdetail.php
+${ZM_HTTPD_ROOT}/skins/flat/views/events.php
+${ZM_HTTPD_ROOT}/skins/flat/views/export.php
+${ZM_HTTPD_ROOT}/skins/flat/views/filter.php
+${ZM_HTTPD_ROOT}/skins/flat/views/filtersave.php
+${ZM_HTTPD_ROOT}/skins/flat/views/frame.php
+${ZM_HTTPD_ROOT}/skins/flat/views/frames.php
+${ZM_HTTPD_ROOT}/skins/flat/views/function.php
+${ZM_HTTPD_ROOT}/skins/flat/views/group.php
+${ZM_HTTPD_ROOT}/skins/flat/views/groups.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/Makefile.am
+${ZM_HTTPD_ROOT}/skins/flat/views/js/console.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/console.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/control.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/controlpreset.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/controlpreset.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/cycle.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/cycle.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/devices.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/donate.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/donate.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/event.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/event.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/events.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/events.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/export.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/export.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/filter.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/filter.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/group.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/groups.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/log.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/login.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/monitor.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/monitor.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/monitorpreset.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/monitorprobe.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/montage.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/montage.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/options.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/postlogin.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/state.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/state.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/timeline.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/timeline.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/user.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/version.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/version.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/video.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/video.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/watch.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/watch.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/js/zone.js
+${ZM_HTTPD_ROOT}/skins/flat/views/js/zone.js.php
+${ZM_HTTPD_ROOT}/skins/flat/views/log.php
+${ZM_HTTPD_ROOT}/skins/flat/views/login.php
+${ZM_HTTPD_ROOT}/skins/flat/views/logout.php
+${ZM_HTTPD_ROOT}/skins/flat/views/monitor.php
+${ZM_HTTPD_ROOT}/skins/flat/views/monitorpreset.php
+${ZM_HTTPD_ROOT}/skins/flat/views/monitorprobe.php
+${ZM_HTTPD_ROOT}/skins/flat/views/montage.php
+${ZM_HTTPD_ROOT}/skins/flat/views/none.php
+${ZM_HTTPD_ROOT}/skins/flat/views/optionhelp.php
+${ZM_HTTPD_ROOT}/skins/flat/views/options.php
+${ZM_HTTPD_ROOT}/skins/flat/views/postlogin.php
+${ZM_HTTPD_ROOT}/skins/flat/views/settings.php
+${ZM_HTTPD_ROOT}/skins/flat/views/state.php
+${ZM_HTTPD_ROOT}/skins/flat/views/stats.php
+${ZM_HTTPD_ROOT}/skins/flat/views/status.php
+${ZM_HTTPD_ROOT}/skins/flat/views/timeline.php
+${ZM_HTTPD_ROOT}/skins/flat/views/user.php
+${ZM_HTTPD_ROOT}/skins/flat/views/version.php
+${ZM_HTTPD_ROOT}/skins/flat/views/video.php
+${ZM_HTTPD_ROOT}/skins/flat/views/watch.php
+${ZM_HTTPD_ROOT}/skins/flat/views/zone.php
+${ZM_HTTPD_ROOT}/skins/flat/views/zones.php
 ${ZM_HTTPD_ROOT}/skins/mobile/css/skin.css
 ${ZM_HTTPD_ROOT}/skins/mobile/includes/config.php
 ${ZM_HTTPD_ROOT}/skins/mobile/includes/control_functions.php
diff --git a/security/zoneminder/distinfo b/security/zoneminder/distinfo
index 3cfea4befdf..ab9176abefd 100644
--- a/security/zoneminder/distinfo
+++ b/security/zoneminder/distinfo
@@ -1,24 +1,22 @@
-$NetBSD: distinfo,v 1.4 2014/05/20 11:30:27 dsainty Exp $
+$NetBSD: distinfo,v 1.5 2015/04/05 08:51:08 dsainty Exp $
 
-SHA1 (ZoneMinder-1.25.0.tar.gz) = a93a976a5cd82f1e197f4d7bd626d3f0387c4231
-RMD160 (ZoneMinder-1.25.0.tar.gz) = 32a4f503770103e55bfe592864c1cab82e7395a6
-Size (ZoneMinder-1.25.0.tar.gz) = 1119091 bytes
-SHA1 (patch-Makefile_am) = 09b3ba7f9c292ef672506219be66f059290b6405
-SHA1 (patch-configure_ac) = 87410ce8bc8fe42e08bf0e32e40b59619f7db90d
-SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 9aa69b922c323e2ba34e37de7923e2ee97430f7f
-SHA1 (patch-scripts_zm_in) = 91809c9a179a0135c432a0ffad7c2d2ddfd512de
-SHA1 (patch-src_Makefile_am) = 84999df8b7c80b049e2dd9cb308e12f50ed8285f
-SHA1 (patch-src_zm__thread.h) = 8313d3294592fd08c775f612d70cc935e4f64d9a
-SHA1 (patch-src_zm__timer.h) = 38dae4f8573c7ae6d459adddf05260ce4b6e2088
+SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
+RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
+Size (ZoneMinder-1.28.1.tar.gz) = 3864811 bytes
+SHA1 (patch-Makefile_am) = ae6f2f3c6825a44be019ad5dc0b45929c85d4ba9
+SHA1 (patch-configure_ac) = 2370065080bb99a76d2581fa4538e5c70f7ec739
+SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568
+SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66
+SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
+SHA1 (patch-src_zm__thread.h) = fd4fc0a5d8003a29777ce57fe928901ca50b50f7
+SHA1 (patch-src_zm__timer.h) = 7371f7dbe42f04d031276eda3b2e94bd8f24cf68
 SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
-SHA1 (patch-src_zm__utils.h) = 361a69dfd4e2c3e46cf6fea3e1470df2e5cfa446
+SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e
 SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7
 SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e
 SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb
-SHA1 (patch-src_zm_remote_camera_h) = c86b6267c295caba71ca72df02c24e6b6cba981f
-SHA1 (patch-src_zm_signal_h) = 226e96d4771921a8ad23fbe130a80a43550062d3
+SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
 SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
 SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
-SHA1 (patch-src_zmf_cpp) = 77dafa6ef6e9756b975e45b2ca41d1be85f9bf2c
 SHA1 (patch-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894
 SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6
diff --git a/security/zoneminder/patches/patch-Makefile_am b/security/zoneminder/patches/patch-Makefile_am
index e64706c1aa5..5f06090d9a7 100644
--- a/security/zoneminder/patches/patch-Makefile_am
+++ b/security/zoneminder/patches/patch-Makefile_am
@@ -1,27 +1,27 @@
-$NetBSD: patch-Makefile_am,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-Makefile_am,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
 Disable the hacks around ownership setup so Pkgsrc can take responsibility.
 Don't install zm.conf at all - let Pkgsrc install it into EGDIR.
 
 --- Makefile.am.orig	2011-05-20 09:39:37.000000000 +0000
 +++ Makefile.am
-@@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = gnu
- webuser = @WEB_USER@
+@@ -5,8 +5,8 @@
  webgroup = @WEB_GROUP@
+ zmconfigdir = @ZM_CONFIG_DIR@
  
--sysconf_DATA = \
+-zmconfig_DATA = \
 -	zm.conf
-+#sysconf_DATA = \
++#zmconfig_DATA = \
 +#	zm.conf
  
  SUBDIRS = \
  	src \
-@@ -19,7 +19,7 @@ EXTRA_DIST = \
+@@ -20,7 +20,7 @@
  	zmconfgen.pl.in
  
  # Yes, you are correct. This is a HACK!
 -install-data-hook:
 +pkgsrc-disabled-install-data-hook:
- 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
- 	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
- 	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
+ 	( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_DATA) )
+ 	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
+ 	( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
diff --git a/security/zoneminder/patches/patch-configure_ac b/security/zoneminder/patches/patch-configure_ac
index 779599de516..57b767bb0a2 100644
--- a/security/zoneminder/patches/patch-configure_ac
+++ b/security/zoneminder/patches/patch-configure_ac
@@ -1,30 +1,17 @@
-$NetBSD: patch-configure_ac,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-configure_ac,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
-Set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the
-database build scripts as installed files, not out of a probably non-existent
-build directory.  Correct shell syntax.  Allow Pkgsrc to manage dlopen()
-support.
+Correct shell syntax.  Allow Pkgsrc to manage dlopen() support.
 
---- configure.ac.orig	2011-08-23 15:10:32.000000000 +0000
-+++ configure.ac
-@@ -2,10 +2,10 @@ AC_PREREQ(2.59)
- AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR(src/zm.h)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
--PATH_BUILD=`pwd`
--AC_SUBST(PATH_BUILD)
-+AC_DEFINE_DIR([DATA_ROOT_DIR],[datarootdir],[Expanded data directory])
-+AC_SUBST(PATH_BUILD, "$DATA_ROOT_DIR/zoneminder")
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
- 
-@@ -19,31 +19,31 @@ AC_ARG_VAR(ZM_RUNDIR,[Location of transi
- AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+--- configure.ac.orig	2015-02-05 15:52:37.000000000 +1300
++++ configure.ac	2015-04-01 23:24:28.305177975 +1300
+@@ -48,41 +48,41 @@
  AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
+ AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
  
+-if test "$ZM_DB_TYPE" == ""; then
++if test "$ZM_DB_TYPE" = ""; then
+ 	AC_SUBST(ZM_DB_TYPE,[mysql])
+ fi
 -if test "$ZM_DB_HOST" == ""; then
 +if test "$ZM_DB_HOST" = ""; then
  	AC_SUBST(ZM_DB_HOST,[localhost])
@@ -47,12 +34,16 @@ support.
  fi
 -if test "$ZM_MYSQL_ENGINE" == ""; then
 +if test "$ZM_MYSQL_ENGINE" = ""; then
- 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+ 	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
  fi
 -if test "$ZM_RUNDIR" == ""; then
 +if test "$ZM_RUNDIR" = ""; then
  	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
  fi
+-if test "$ZM_SOCKDIR" == ""; then
++if test "$ZM_SOCKDIR" = ""; then
+ 	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
+ fi
 -if test "$ZM_TMPDIR" == ""; then
 +if test "$ZM_TMPDIR" = ""; then
  	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
@@ -61,8 +52,13 @@ support.
 +if test "$ZM_LOGDIR" = ""; then
  	AC_SUBST(ZM_LOGDIR,[/var/log/zm])
  fi
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+-if test "$ZM_CONFIG_DIR" == ""; then
++if test "$ZM_CONFIG_DIR" = ""; then
+ 	AC_SUBST(ZM_CONFIG_DIR,[$SYSCONFDIR])
+ fi
  
-@@ -203,7 +203,7 @@ AC_ARG_ENABLE(mmap,
+@@ -254,7 +254,7 @@
      filesystem which will normally be the case by default.
      e.g. --enable-mmap=yes or --disable-mmap])
  )
@@ -71,7 +67,7 @@ support.
    AC_DEFINE(ZM_MEM_MAPPED,1,"Whether to use mapped rather than shared memory")
  else
    AC_DEFINE(ZM_MEM_MAPPED,0,"Whether to use mapped rather than shared memory")
-@@ -254,7 +254,7 @@ AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
+@@ -303,7 +303,7 @@
  AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
  AC_CHECK_PROG(OPT_NETPBM,pnmscale,yes,no)
  AC_PATH_PROG(PATH_NETPBM,pnmscale)
@@ -80,18 +76,32 @@ support.
  PATH_NETPBM=`dirname $PATH_NETPBM`
  fi
  
-@@ -262,8 +262,8 @@ fi
- AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR(zm requires libmysqlclient.a))
+@@ -311,20 +311,20 @@
+ AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
  AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
  AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
 -AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
 -if test "$ZM_SSL_LIB" == "openssl"; then
 +#AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
 +if test "$ZM_SSL_LIB" = "openssl"; then
+ AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
  AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
  else
+ AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
+ AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
++if test "$ZM_HAS_GNUTLS_OPENSSL" = "0" && test "$ZM_HAS_GNUTLS" = "0"; then
+ AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
+ fi
  AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-@@ -293,7 +293,7 @@ AC_CHECK_HEADERS(syscall.h,,,)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
++if test "$ZM_HAS_GNUTLS_OPENSSL" = "1"; then
+ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ fi
+@@ -356,7 +356,7 @@
  AC_CHECK_HEADERS(pthread.h,,,)
  AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
  AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
@@ -100,8 +110,8 @@ support.
  AC_SUBST(ZM_HAS_V4L,1)
  else
  AC_SUBST(ZM_HAS_V4L,0)
-@@ -307,7 +307,7 @@ AC_CHECK_HEADERS(libavformat/avformat.h,
- AC_CHECK_HEADERS(libswscale/swscale.h,,,)
+@@ -372,7 +372,7 @@
+ AC_LANG_POP([C])
  AC_CHECK_HEADERS(pcre/pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
  AC_CHECK_HEADERS(pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
 -if test "$ENABLE_MMAP" == "yes"; then
@@ -109,16 +119,21 @@ support.
  AC_CHECK_HEADERS(sys/mman.h,,,)
  AC_CHECK_HEADERS(fcntl.h,,,)
  else
-@@ -317,7 +317,7 @@ fi
- AC_CHECK_HEADERS(zlib.h,,,)
+@@ -383,11 +383,11 @@
+ AC_CHECK_HEADERS(vlc/vlc.h,,,)
+ AC_CHECK_HEADERS(curl/curl.h,,,)
  
- AC_CHECK_DECLS(round,,,[#include <math.h>])
 -if test "$ZM_SSL_LIB" == "openssl"; then
 +if test "$ZM_SSL_LIB" = "openssl"; then
  AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
  #include <openssl/md5.h>])
  else
-@@ -339,7 +339,7 @@ AC_PROG_PERL_MODULES(Time::HiRes,,AC_MSG
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
++if test "$ZM_HAS_GNUTLS_OPENSSL" = "1"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+ #include <gnutls/openssl.h>])
+ else
+@@ -411,7 +411,7 @@
  AC_PROG_PERL_MODULES(Date::Manip,,AC_MSG_ERROR(zm requires Date::Manip))
  AC_PROG_PERL_MODULES(LWP::UserAgent,,AC_MSG_ERROR(zm requires LWP::UserAgent))
  AC_PROG_PERL_MODULES(ExtUtils::MakeMaker,,AC_MSG_ERROR(zm requires ExtUtils::MakeMaker))
diff --git a/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm b/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
index 1f6021035fa..b3df6c6a367 100644
--- a/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
+++ b/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
@@ -1,4 +1,4 @@
-$NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm,v 1.1 2014/05/20 11:30:27 dsainty Exp $
+$NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm,v 1.2 2015/04/05 08:51:08 dsainty Exp $
 
 Perl doesn't really support "> /dev/null", so just capture into $output.
 
@@ -19,35 +19,35 @@ installed on the system, or not in the $PATH.
 
 Use the -m parameter to su, as ZM_WEB_USER shouldn't require a login shell.
 
---- scripts/ZoneMinder/lib/ZoneMinder/General.pm.orig	2014-05-13 22:59:22.229694642 +1200
-+++ scripts/ZoneMinder/lib/ZoneMinder/General.pm	2014-05-13 23:03:06.377703932 +1200
-@@ -103,7 +103,7 @@
- 	my $suffix = "";
- 	my $command = $prefix.$null_command.$suffix;
- 	Debug( "Testing \"$command\"\n" );
+--- scripts/ZoneMinder/lib/ZoneMinder/General.pm.orig	2015-04-01 19:40:39.708621257 +1300
++++ scripts/ZoneMinder/lib/ZoneMinder/General.pm	2015-04-01 19:50:47.372646449 +1300
+@@ -107,7 +107,7 @@
+     my $suffix = "";
+     my $command = $prefix.$null_command.$suffix;
+     Debug( "Testing \"$command\"\n" );
 -    $command .= " > /dev/null 2>&1"; 
-+	$command .= " 2>&1";
- 	my $output = qx($command);
- 	my $status = $? >> 8;
- 	if ( !$status )
-@@ -120,6 +120,7 @@
- 		$suffix = "'";
- 		$command = $prefix.$null_command.$suffix;
- 		Debug( "Testing \"$command\"\n" );
-+		$command .= " 2>&1";
- 		my $output = qx($command);
- 		my $status = $? >> 8;
- 		if ( !$status )
-@@ -132,10 +133,11 @@
- 			chomp( $output );
- 			Debug( "Test failed, '$output'\n" );
++    $command .= " 2>&1";
+     my $output = qx($command);
+     my $status = $? >> 8;
+     if ( !$status )
+@@ -124,6 +124,7 @@
+         $suffix = "'";
+         $command = $prefix.$null_command.$suffix;
+         Debug( "Testing \"$command\"\n" );
++        $command .= " 2>&1";
+         my $output = qx($command);
+         my $status = $? >> 8;
+         if ( !$status )
+@@ -136,10 +137,11 @@
+             chomp( $output );
+             Debug( "Test failed, '$output'\n" );
  
--			$prefix = "su ".ZM_WEB_USER." -c '";
-+			$prefix = "su -m ".ZM_WEB_USER." -c '";
- 			$suffix = "'";
- 			$command = $prefix.$null_command.$suffix;
- 			Debug( "Testing \"$command\"\n" );
-+			$command .= " 2>&1";
- 			$output = qx($command);
- 			$status = $? >> 8;
- 			if ( !$status )
+-            $prefix = "su ".$Config{ZM_WEB_USER}." -c '";
++            $prefix = "su -m ".$Config{ZM_WEB_USER}." -c '";
+             $suffix = "'";
+             $command = $prefix.$null_command.$suffix;
+             Debug( "Testing \"$command\"\n" );
++            $command .= " 2>&1";
+             $output = qx($command);
+             $status = $? >> 8;
+             if ( !$status )
diff --git a/security/zoneminder/patches/patch-scripts_zm_in b/security/zoneminder/patches/patch-scripts_zm_in
index b108b17c5d8..665c5a1181b 100644
--- a/security/zoneminder/patches/patch-scripts_zm_in
+++ b/security/zoneminder/patches/patch-scripts_zm_in
@@ -1,14 +1,14 @@
-$NetBSD: patch-scripts_zm_in,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-scripts_zm_in,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
 /etc/rc.d/init.d/functions doesn't commonly exist.
 
 The LOCKFILE feature appears unused, and requires a /var/lock/subsys directory
 we don't have.
 
---- scripts/zm.in.orig	2011-06-22 10:42:16.000000000 +0000
-+++ scripts/zm.in
-@@ -4,12 +4,12 @@
- # processname: zmpkg.pl
+--- scripts/zm.in.orig	2015-02-05 15:52:37.000000000 +1300
++++ scripts/zm.in	2015-04-01 19:13:32.876553811 +1300
+@@ -7,12 +7,12 @@
+ # For systemd environments, use the ZoneMinder systemd unit file instead
  
  # Source function library.
 -. /etc/rc.d/init.d/functions
@@ -22,7 +22,7 @@ we don't have.
  
  loadconf()
  {
-@@ -50,7 +50,7 @@ start()
+@@ -54,7 +54,7 @@
  	RETVAL=$?
  	[ $RETVAL = 0 ] && success || failure
  	echo
@@ -31,7 +31,7 @@ we don't have.
  	return $RETVAL
  }
  
-@@ -62,7 +62,7 @@ stop()
+@@ -66,7 +66,7 @@
  	RETVAL=$?
  	[ $RETVAL = 0 ] && success || failure
  	echo
@@ -40,7 +40,7 @@ we don't have.
  }
  
  zmstatus()
-@@ -103,7 +103,7 @@ case "$1" in
+@@ -107,7 +107,7 @@
  		result=`$ZM_PATH_BIN/zmdc.pl check`
  		if [ "$result" = "running" ]; then
  			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
diff --git a/security/zoneminder/patches/patch-src_Makefile_am b/security/zoneminder/patches/patch-src_Makefile_am
index 9f2d7c366c1..5c9d928bc55 100644
--- a/security/zoneminder/patches/patch-src_Makefile_am
+++ b/security/zoneminder/patches/patch-src_Makefile_am
@@ -1,18 +1,15 @@
-$NetBSD: patch-src_Makefile_am,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_Makefile_am,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
-Don't pointlessly chown zms.  Don't setuid zmfix here, let Pkgsrc deal with
-that.
+Don't pointlessly chown zms.
 
---- src/Makefile.am.orig	2011-06-21 07:40:14.000000000 +0000
-+++ src/Makefile.am
-@@ -125,8 +125,8 @@ dist-hook:
+--- src/Makefile.am.orig	2015-02-05 15:52:37.000000000 +1300
++++ src/Makefile.am	2015-04-01 19:33:05.628602430 +1300
+@@ -128,7 +128,7 @@
  # Yes, you are correct. This is a HACK!
  install-exec-hook:
  	( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
 -	( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
--	( cd $(DESTDIR)@bindir@; chmod u+s zmfix )
 +	( cd $(DESTDIR)$(cgidir); ln -f zms nph-zms )
-+#	( cd $(DESTDIR)@bindir@; chmod u+s zmfix )
  
  uninstall-hook:
  	( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )
diff --git a/security/zoneminder/patches/patch-src_zm__thread.h b/security/zoneminder/patches/patch-src_zm__thread.h
index 5a3e5d6cc32..91469767f58 100644
--- a/security/zoneminder/patches/patch-src_zm__thread.h
+++ b/security/zoneminder/patches/patch-src_zm__thread.h
@@ -1,21 +1,13 @@
-$NetBSD: patch-src_zm__thread.h,v 1.2 2013/04/29 21:31:13 joerg Exp $
+$NetBSD: patch-src_zm__thread.h,v 1.3 2015/04/05 08:51:08 dsainty Exp $
 
---- src/zm_thread.h.orig	2009-06-08 09:20:17.000000000 +0000
-+++ src/zm_thread.h
-@@ -20,6 +20,7 @@
- #ifndef ZM_THREAD_H
- #define ZM_THREAD_H
- 
-+#include <unistd.h>
- #include <pthread.h>
- #include "zm_exception.h"
- #include "zm_utils.h"
-@@ -27,7 +28,7 @@
+--- src/zm_thread.h.orig	2015-02-05 15:52:37.000000000 +1300
++++ src/zm_thread.h	2015-04-01 17:04:46.728233504 +1300
+@@ -32,7 +32,7 @@
  class ThreadException : public Exception
  {
  public:
--    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) )
-+    ThreadException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (long int)syscall(224) ) )
+-    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
++    ThreadException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (long int)syscall(SYS_gettid) ) )
      {
      }
  };
diff --git a/security/zoneminder/patches/patch-src_zm__timer.h b/security/zoneminder/patches/patch-src_zm__timer.h
index 77b6a5e9301..bcfa81c5066 100644
--- a/security/zoneminder/patches/patch-src_zm__timer.h
+++ b/security/zoneminder/patches/patch-src_zm__timer.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm__timer.h,v 1.1 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm__timer.h,v 1.2 2015/04/05 08:51:08 dsainty Exp $
 
 --- src/zm_timer.h.orig	2008-07-25 09:33:24.000000000 +0000
 +++ src/zm_timer.h
@@ -6,8 +6,8 @@ $NetBSD: patch-src_zm__timer.h,v 1.1 2013/03/24 16:47:47 joerg Exp $
      class TimerException : public Exception
      {
      public:
--        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) )
-+        TimerException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (long int)syscall(224) ) )
+-        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
++        TimerException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (long int)syscall(SYS_gettid) ) )
          {
          }
      };
diff --git a/security/zoneminder/patches/patch-src_zm__utils.h b/security/zoneminder/patches/patch-src_zm__utils.h
index 87c319a1968..ccc11dc1398 100644
--- a/security/zoneminder/patches/patch-src_zm__utils.h
+++ b/security/zoneminder/patches/patch-src_zm__utils.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_zm__utils.h,v 1.1 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm__utils.h,v 1.2 2015/04/05 08:51:08 dsainty Exp $
 
---- src/zm_utils.h.orig	2009-06-02 07:59:26.000000000 +0000
-+++ src/zm_utils.h
-@@ -26,7 +26,6 @@
- typedef std::vector<std::string> StringVector;
+--- src/zm_utils.h.orig	2015-04-01 17:20:39.840273017 +1300
++++ src/zm_utils.h	2015-04-01 17:28:57.376293647 +1300
+@@ -33,7 +33,6 @@
+ std::string replaceAll(std::string str, std::string from, std::string to);
  
  const std::string stringtf( const char *format, ... );
 -const std::string stringtf( const std::string &format, ... );
diff --git a/security/zoneminder/patches/patch-src_zm_remote_camera_h b/security/zoneminder/patches/patch-src_zm_remote_camera_h
index b68c6d005bf..1bdc9b675b0 100644
--- a/security/zoneminder/patches/patch-src_zm_remote_camera_h
+++ b/security/zoneminder/patches/patch-src_zm_remote_camera_h
@@ -1,16 +1,18 @@
-$NetBSD: patch-src_zm_remote_camera_h,v 1.3 2013/04/29 21:31:13 joerg Exp $
+$NetBSD: patch-src_zm_remote_camera_h,v 1.4 2015/04/05 08:51:08 dsainty Exp $
 
 Declare sockaddr_in.
 
---- src/zm_remote_camera.h.orig	2009-06-02 07:59:26.000000000 +0000
-+++ src/zm_remote_camera.h
-@@ -22,8 +22,11 @@
- 
+--- src/zm_remote_camera.h.orig	2015-02-05 15:52:37.000000000 +1300
++++ src/zm_remote_camera.h	2015-04-01 17:56:10.736361360 +1300
+@@ -23,10 +23,13 @@
  #include "zm_camera.h"
+ #include "zm_rtsp_auth.h"
  
 +#include <netinet/in.h>
 +
  #include <string>
+ #include <sys/types.h>
+ #include <sys/socket.h>
  #include <netdb.h>
 +#include <time.h>
  
diff --git a/security/zoneminder/patches/patch-src_zm_signal_h b/security/zoneminder/patches/patch-src_zm_signal_h
deleted file mode 100644
index 7c2d35e2df1..00000000000
--- a/security/zoneminder/patches/patch-src_zm_signal_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_zm_signal_h,v 1.2 2013/03/24 16:47:47 joerg Exp $
-
-Don't include <execinfo.h> for lack of portability.
-
---- src/zm_signal.h.orig	2008-07-25 09:33:24.000000000 +0000
-+++ src/zm_signal.h
-@@ -21,7 +21,6 @@
- #define ZM_SIGNAL_H
- 
- #include <signal.h>
--#include <execinfo.h>
- 
- #include "zm.h"
- 
diff --git a/security/zoneminder/patches/patch-src_zmf_cpp b/security/zoneminder/patches/patch-src_zmf_cpp
deleted file mode 100644
index b5e0b2db76b..00000000000
--- a/security/zoneminder/patches/patch-src_zmf_cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-src_zmf_cpp,v 1.2 2013/03/24 16:47:47 joerg Exp $
-
-http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
-
-Fix Incomplete Image errors in zmf
-
-This patch changes the socket reader in zmf from a single read, to a loop
-read.  Incomplete reads would be reported even though the image writer wrote
-the whole image to the socket.  The problem was when the read went to read the
-image frame from the socket, all the data had not yet been written to the
-socket by the writer, so the reader thought there was a problem.  The loop
-reads from the socket until a full image frame is read, or there is an error.
-
---- src/zmf.cpp.orig	2011-06-21 09:19:11.000000000 +0000
-+++ src/zmf.cpp
-@@ -231,16 +231,39 @@ int main( int argc, char *argv[] )
- 		}
- 		Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
- 		static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
--		n_bytes = read( sd, image_data, frame_header.image_length );
--		if ( n_bytes != (ssize_t)frame_header.image_length )
-+
-+		// Read for pipe and loop until bytes expected have been read or an error occures
-+		int bytes_read = 0;
-+		do
- 		{
--			if ( n_bytes < 0 )
-+			n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
-+			if (n_bytes < 0) break; // break on error
-+			if (n_bytes < frame_header.image_length)
- 			{
--				Error( "Can't read frame image data: %s", strerror(errno) );
-+				// print some informational messages 
-+				if (bytes_read == 0)
-+				{
-+					Warning("Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
-+				}
-+				else if (bytes_read+n_bytes == frame_header.image_length)
-+				{
-+					Warning("Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
-+				}
-+				else
-+				{
-+					Warning("Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
-+				}
- 			}
--			else if ( n_bytes > 0 )
-+			bytes_read+= n_bytes;
-+		} while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
-+
-+		// Print errors if there was a problem
-+		if ( n_bytes < 1 )
-+		{
-+			Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
-+			if ( n_bytes < 0 )
- 			{
--				Error( "Incomplete read of frame image data, %d bytes only", n_bytes );
-+				Error( "Can't read frame image data: %s", strerror(errno) );
- 			}
- 			else
- 			{
-@@ -249,16 +272,18 @@ int main( int argc, char *argv[] )
- 			ReopenSocket( sd, monitor->Id() );
- 			continue;
- 		}
-+
- 		static char subpath[PATH_MAX] = "";
--        if ( config.use_deep_storage )
--        {
--            struct tm *time = localtime( &frame_header.event_time );
--            snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
--        }
--        else
--        {
--            snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
--        }
-+		if ( config.use_deep_storage )
-+		{
-+		    struct tm *time = localtime( &frame_header.event_time );
-+		    snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
-+		}
-+		else
-+		{
-+		    snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
-+		}
-+
- 		static char path[PATH_MAX] = "";
- 		snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
- 		Debug( 1, "Got image, writing to %s", path );