From d958a131147d5e9a2d8ff927daf3af5ee625ec1f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 30 Dec 2014 09:49:14 -0500
Subject: [PATCH 1/2] this patch has been applied to master branch and is no
 longer needed.

---
 distros/ubuntu1204/patches/01_vendor-perl.diff | 17 -----------------
 distros/ubuntu1204/patches/series              |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 distros/ubuntu1204/patches/01_vendor-perl.diff

diff --git a/distros/ubuntu1204/patches/01_vendor-perl.diff b/distros/ubuntu1204/patches/01_vendor-perl.diff
deleted file mode 100644
index a58ef8778..000000000
--- a/distros/ubuntu1204/patches/01_vendor-perl.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: ZoneMinder/configure.ac
-===================================================================
---- ZoneMinder.orig/configure.ac	2014-12-13 15:10:27.705191682 +0100
-+++ ZoneMinder/configure.ac	2014-12-13 16:50:07.101049743 +0100
-@@ -443,10 +443,10 @@
-     PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
-     PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
-     EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
--    PERL_MM_PARMS="PREFIX=$prefix"
-+    PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
- else
-     EXTRA_PERL_LIB="# Include from system perl paths only"
--    PERL_MM_PARMS=
-+    PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
- fi
- AC_SUBST(PERL_MM_PARMS)
- AC_SUBST(EXTRA_PERL_LIB)
diff --git a/distros/ubuntu1204/patches/series b/distros/ubuntu1204/patches/series
index b479dc507..e69de29bb 100644
--- a/distros/ubuntu1204/patches/series
+++ b/distros/ubuntu1204/patches/series
@@ -1 +0,0 @@
-01_vendor-perl.diff

From e460c6f448bdb169aa8e4d63ea8fa7d09036caa7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 1 Jan 2015 17:18:12 -0500
Subject: [PATCH 2/2] BSD uses some different includes, these are from FreeBSD
 ports

---
 src/zm_comms.cpp | 5 +++++
 src/zmc.cpp      | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index b30bed1d5..56bebf01b 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -25,7 +25,12 @@
 #include <fcntl.h>
 #include <stdarg.h>
 //#include <memory.h>
+#if defined(BSD)
+#include <stdlib.h>
+#else
 #include <alloca.h>
+#endif
+
 #include <string.h>
 //#include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/src/zmc.cpp b/src/zmc.cpp
index df6258f69..2d25822b4 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -19,7 +19,11 @@
 
 #include <getopt.h>
 #include <signal.h>
+#if defined(BSD)
+#include <limits.h>
+#else
 #include <values.h>
+#endif
 
 #include "zm.h"
 #include "zm_db.h"