Update spectrum ot 1.4.8.

4 files changed, 54 insertions, 11 deletions

diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile
index eb0496dfe30..eeaf06d0c9d 100644
--- a/chat/spectrum/Makefile
+++ b/chat/spectrum/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/10/22 15:00:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/28 00:27:57 schnoebe Exp $
 
-DISTNAME=		spectrum-1.4.7
-PKGREVISION=		4
+DISTNAME=		spectrum-1.4.8
 CATEGORIES=		chat
-MASTER_SITES=		http://spectrum.im/attachments/download/37/
+MASTER_SITES=		http://spectrum.im/attachments/download/43/
 
 MAINTAINER=		schnoebe@NetBSD.org
 HOMEPAGE=		http://spectrum.im/
diff --git a/chat/spectrum/distinfo b/chat/spectrum/distinfo
index 9cb4e411fe6..5efbcd1e313 100644
--- a/chat/spectrum/distinfo
+++ b/chat/spectrum/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+$NetBSD: distinfo,v 1.2 2011/10/28 00:27:57 schnoebe Exp $
 
-SHA1 (spectrum-1.4.7.tar.gz) = d07c198090ee1b0404d7641546d2feb56e912ea7
-RMD160 (spectrum-1.4.7.tar.gz) = 22db29cdd321a1fc7d77db7eb09c19cb49c963d6
-Size (spectrum-1.4.7.tar.gz) = 235303 bytes
-SHA1 (patch-CMakeLists.txt) = ba2f011dd2881f1c9b98de47934834377590f2ab
+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-man_spectrumctl.8) = 31196aba714f6fca26c20513e677a62ec39fefb5
 SHA1 (patch-spectrumctl_spectrum_env.py) = 0c266de23d0af8d317fcd4efdfec64bb85714de3
 SHA1 (patch-spectrumctl_spectrumctl.py) = 56166fa6477a3dba56b30501f2112cd6d21db40f
+SHA1 (patch-src_spectrum_util.cpp) = 093036a654ae32979c5654b6cc029f7eddf5e274
diff --git a/chat/spectrum/patches/patch-CMakeLists.txt b/chat/spectrum/patches/patch-CMakeLists.txt
index b74faa467a1..b7bbc9000b4 100644
--- a/chat/spectrum/patches/patch-CMakeLists.txt
+++ b/chat/spectrum/patches/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2011/10/28 00:27:58 schnoebe Exp $
 
 #
 # change man path to be configurable to PKGSRC standards.
@@ -6,7 +6,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
 
 --- CMakeLists.txt.orig	2010-07-13 17:38:39.000000000 +0000
 +++ CMakeLists.txt
-@@ -395,11 +398,11 @@ INSTALL(FILES
+@@ -176,11 +176,11 @@ INSTALL(FILES
  
  INSTALL(FILES
      ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8
diff --git a/chat/spectrum/patches/patch-src_spectrum_util.cpp b/chat/spectrum/patches/patch-src_spectrum_util.cpp
new file mode 100644
index 00000000000..985c556ea14
--- /dev/null
+++ b/chat/spectrum/patches/patch-src_spectrum_util.cpp
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_spectrum_util.cpp,v 1.1 2011/10/28 00:27:58 schnoebe Exp $
+
+revise the memory usage statistics handling to work only on FreeBSD
+(where it was designed.)
+
+--- src/spectrum_util.cpp.orig	2011-06-11 13:17:44.000000000 +0000
++++ src/spectrum_util.cpp
+@@ -28,7 +28,7 @@
+ #include "protocols/abstractprotocol.h"
+ #include "transport.h"
+ #include <sys/param.h>
+-#ifdef BSD
++#if defined(__FreeBSD_version) /* should also include a tested version, but */
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <sys/param.h>
+@@ -117,7 +117,7 @@ const std::string generateUUID() {
+ }
+ 
+ #ifndef WIN32
+-#ifdef BSD
++#ifdef __FreeBSD_version
+ void process_mem_usage(double& vm_usage, double& resident_set) {
+ 	int mib[4];
+ 	size_t size;
+@@ -151,7 +151,7 @@ void process_mem_usage(double& vm_usage,
+ 	resident_set = (double) (proc.ki_rssize * pagesize / 1024);
+ 	vm_usage = (double) proc.ki_size;
+ }
+-#else /* BSD */
++#else /* __FreeBSD_version */
+ void process_mem_usage(double& vm_usage, double& resident_set) {
+ 	using std::ios_base;
+ 	using std::ifstream;
+@@ -190,7 +190,7 @@ void process_mem_usage(double& vm_usage,
+ 	vm_usage     = vsize / 1024.0;
+ 	resident_set = rss * page_size_kb;
+ }
+-#endif /* else BSD */
++#endif /* else __FreeBSD_version */
+ #endif /* WIN32 */
+ 
+ std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {