Quiet a warning from cmake;

fix an unwrapped include of ev.h.

5 files changed, 38 insertions, 8 deletions

diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile
index eeaf06d0c9d..b7c203fe7d4 100644
--- a/chat/spectrum/Makefile
+++ b/chat/spectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/28 00:27:57 schnoebe Exp $
+# $NetBSD: Makefile,v 1.9 2011/10/28 17:34:06 schnoebe Exp $
 
 DISTNAME=		spectrum-1.4.8
 CATEGORIES=		chat
@@ -100,6 +100,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/py-readline/buildlink3.mk"
+# .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/poco/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/chat/spectrum/distinfo b/chat/spectrum/distinfo
index 5efbcd1e313..de46bfe0dbe 100644
--- a/chat/spectrum/distinfo
+++ b/chat/spectrum/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/10/28 00:27:57 schnoebe Exp $
+$NetBSD: distinfo,v 1.3 2011/10/28 17:34:06 schnoebe Exp $
 
 SHA1 (spectrum-1.4.8.tar.gz) = 9323f8f89eb1f84e36e1d64845741cbebbf0d249
 RMD160 (spectrum-1.4.8.tar.gz) = 859c1d0f6f1c4d535bbada13c1c11f2b4550805a
 Size (spectrum-1.4.8.tar.gz) = 239725 bytes
-SHA1 (patch-CMakeLists.txt) = 3839021e10808c8b94c42af650d868292d0e1edf
+SHA1 (patch-CMakeLists.txt) = 9f7ce54e69ec95cea4aa3eff8d80ae31c8a80a0e
 SHA1 (patch-man_spectrumctl.8) = 31196aba714f6fca26c20513e677a62ec39fefb5
 SHA1 (patch-spectrumctl_spectrum_env.py) = 0c266de23d0af8d317fcd4efdfec64bb85714de3
 SHA1 (patch-spectrumctl_spectrumctl.py) = 56166fa6477a3dba56b30501f2112cd6d21db40f
-SHA1 (patch-src_spectrum_util.cpp) = 093036a654ae32979c5654b6cc029f7eddf5e274
+SHA1 (patch-src_geventloop.h) = b28685cb69b9759ea3496e163d48de641a49eccb
+SHA1 (patch-src_spectrum_util.cpp) = 19201297fe085f093010346c8600399332a60265
diff --git a/chat/spectrum/patches/patch-CMakeLists.txt b/chat/spectrum/patches/patch-CMakeLists.txt
index b7bbc9000b4..d0c43a13e30 100644
--- a/chat/spectrum/patches/patch-CMakeLists.txt
+++ b/chat/spectrum/patches/patch-CMakeLists.txt
@@ -1,11 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2011/10/28 00:27:58 schnoebe Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2011/10/28 17:34:07 schnoebe Exp $
 
 #
 # change man path to be configurable to PKGSRC standards.
+# silence a warning from cmake
 #
 
 --- CMakeLists.txt.orig	2010-07-13 17:38:39.000000000 +0000
 +++ CMakeLists.txt
+@@ -3,6 +3,7 @@ project(spectrum)
+ cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+ if(COMMAND cmake_policy)
+ 	cmake_policy(SET CMP0003 NEW)
++	cmake_policy(SET CMP0017 OLD)
+ endif(COMMAND cmake_policy)
+  
+ file(WRITE src/transport_config.h "\n")
 @@ -176,11 +176,11 @@ INSTALL(FILES
  
  INSTALL(FILES
diff --git a/chat/spectrum/patches/patch-src_geventloop.h b/chat/spectrum/patches/patch-src_geventloop.h
new file mode 100644
index 00000000000..15977d9e0a4
--- /dev/null
+++ b/chat/spectrum/patches/patch-src_geventloop.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_geventloop.h,v 1.1 2011/10/28 17:34:07 schnoebe Exp $
+
+# wrap the usage of ev.h in WITH_LIBEVENT (as should have been done.)
+# pushed upstream as http://spectrum.im/issues/233
+
+--- src/geventloop.h.orig	2011-06-11 13:17:44.000000000 +0000
++++ src/geventloop.h
+@@ -24,7 +24,9 @@
+ #include <glib.h>
+ #include "purple.h"
+ #include "eventloop.h"
+-#include "ev.h"
++#ifdef WITH_LIBEVENT
++#  include "ev.h"
++#endif
+ 
+ #define READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
+ #define WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
diff --git a/chat/spectrum/patches/patch-src_spectrum_util.cpp b/chat/spectrum/patches/patch-src_spectrum_util.cpp
index 985c556ea14..ceb3a9fa761 100644
--- a/chat/spectrum/patches/patch-src_spectrum_util.cpp
+++ b/chat/spectrum/patches/patch-src_spectrum_util.cpp
@@ -1,7 +1,8 @@
-$NetBSD: patch-src_spectrum_util.cpp,v 1.1 2011/10/28 00:27:58 schnoebe Exp $
+$NetBSD: patch-src_spectrum_util.cpp,v 1.2 2011/10/28 17:34:07 schnoebe Exp $
 
-revise the memory usage statistics handling to work only on FreeBSD
-(where it was designed.)
+# revise the memory usage statistics handling to work only on FreeBSD
+# (where it was designed.)
+# pushed upstream as http://spectrum.im/issues/232
 
 --- src/spectrum_util.cpp.orig	2011-06-11 13:17:44.000000000 +0000
 +++ src/spectrum_util.cpp