Tue Apr 7 12:54:36 2015 UTC ()
Recognise lower-case "netbsd" as BSD.

NB: This doesn't fix the threads portability issues yet for NetBSD, but gets
through configuration.


(dsainty)
diff -r1.5 -r1.6 pkgsrc/security/zoneminder/distinfo
diff -r1.3 -r1.4 pkgsrc/security/zoneminder/patches/patch-configure_ac
cvs diff -r1.5 -r1.6 pkgsrc/security/zoneminder/distinfo (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/distinfo 2015/04/05 08:51:08 1.5
+++ pkgsrc/security/zoneminder/distinfo 2015/04/07 12:54:36 1.6
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.5 2015/04/05 08:51:08 dsainty Exp $ 1$NetBSD: distinfo,v 1.6 2015/04/07 12:54:36 dsainty Exp $
2 2
3SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2 3SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
4RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1 4RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
5Size (ZoneMinder-1.28.1.tar.gz) = 3864811 bytes 5Size (ZoneMinder-1.28.1.tar.gz) = 3864811 bytes
6SHA1 (patch-Makefile_am) = ae6f2f3c6825a44be019ad5dc0b45929c85d4ba9 6SHA1 (patch-Makefile_am) = ae6f2f3c6825a44be019ad5dc0b45929c85d4ba9
7SHA1 (patch-configure_ac) = 2370065080bb99a76d2581fa4538e5c70f7ec739 7SHA1 (patch-configure_ac) = 110a7a10506ba931369904d777dec5cc2185f556
8SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568 8SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568
9SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66 9SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66
10SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43 10SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
11SHA1 (patch-src_zm__thread.h) = fd4fc0a5d8003a29777ce57fe928901ca50b50f7 11SHA1 (patch-src_zm__thread.h) = fd4fc0a5d8003a29777ce57fe928901ca50b50f7
12SHA1 (patch-src_zm__timer.h) = 7371f7dbe42f04d031276eda3b2e94bd8f24cf68 12SHA1 (patch-src_zm__timer.h) = 7371f7dbe42f04d031276eda3b2e94bd8f24cf68
13SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760 13SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
14SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e 14SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e
15SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7 15SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7
16SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e 16SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e
17SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb 17SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb
18SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d 18SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
19SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e 19SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
20SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83 20SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
cvs diff -r1.3 -r1.4 pkgsrc/security/zoneminder/patches/Attic/patch-configure_ac (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/patches/Attic/patch-configure_ac 2015/04/05 08:51:08 1.3
+++ pkgsrc/security/zoneminder/patches/Attic/patch-configure_ac 2015/04/07 12:54:36 1.4
@@ -1,19 +1,32 @@ @@ -1,19 +1,32 @@
1$NetBSD: patch-configure_ac,v 1.3 2015/04/05 08:51:08 dsainty Exp $ 1$NetBSD: patch-configure_ac,v 1.4 2015/04/07 12:54:36 dsainty Exp $
2 2
3Correct shell syntax. Allow Pkgsrc to manage dlopen() support. 3Recognise lower-case "netbsd" as BSD.
 4
 5Correct shell test = syntax.
 6
 7Allow Pkgsrc to manage dlopen() support.
4 8
5--- configure.ac.orig 2015-02-05 15:52:37.000000000 +1300 9--- configure.ac.orig 2015-02-05 15:52:37.000000000 +1300
6+++ configure.ac 2015-04-01 23:24:28.305177975 +1300 10+++ configure.ac 2015-04-01 23:24:28.305177975 +1300
 11@@ -23,7 +23,7 @@
 12 # Do something specific for linux
 13 HOST_OS='linux'
 14 ;;
 15- *BSD*)
 16+ *[[Bb][Ss][dD]]*)
 17 # Do something specific for BSD
 18 HOST_OS='BSD'
 19 ;;
7@@ -48,41 +48,41 @@ 20@@ -48,41 +48,41 @@
8 AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm]) 21 AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
9 AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory]) 22 AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
10  23
11-if test "$ZM_DB_TYPE" == ""; then 24-if test "$ZM_DB_TYPE" == ""; then
12+if test "$ZM_DB_TYPE" = ""; then 25+if test "$ZM_DB_TYPE" = ""; then
13 AC_SUBST(ZM_DB_TYPE,[mysql]) 26 AC_SUBST(ZM_DB_TYPE,[mysql])
14 fi 27 fi
15-if test "$ZM_DB_HOST" == ""; then 28-if test "$ZM_DB_HOST" == ""; then
16+if test "$ZM_DB_HOST" = ""; then 29+if test "$ZM_DB_HOST" = ""; then
17 AC_SUBST(ZM_DB_HOST,[localhost]) 30 AC_SUBST(ZM_DB_HOST,[localhost])
18 fi 31 fi
19-if test "$ZM_DB_NAME" == ""; then 32-if test "$ZM_DB_NAME" == ""; then