[pkgsrc/trunk]: pkgsrc/chat/centericq Fix problem with statvfs.h on -current....

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62c9bf278c87
branches:  trunk
changeset: 474945:62c9bf278c87
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Fri May 07 23:18:50 2004 +0000

description:
Fix problem with statvfs.h on -current. Tested and found working on
2.0_BETA (which doesn't have statvfs.h) and on -current (which has it).

Bump pkgrevision.

diffstat:

 chat/centericq/Makefile         |   4 ++--
 chat/centericq/distinfo         |   4 ++--
 chat/centericq/patches/patch-aa |  28 +++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r cfe6700c2159 -r 62c9bf278c87 chat/centericq/Makefile
--- a/chat/centericq/Makefile   Fri May 07 22:47:26 2004 +0000
+++ b/chat/centericq/Makefile   Fri May 07 23:18:50 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/04/15 00:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2004/05/07 23:18:50 hubertf Exp $
 #
 
 DISTNAME=      centericq-4.9.9
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://konst.org.ua/download/
 EXTRACT_SUFX=  .tar.bz2
diff -r cfe6700c2159 -r 62c9bf278c87 chat/centericq/distinfo
--- a/chat/centericq/distinfo   Fri May 07 22:47:26 2004 +0000
+++ b/chat/centericq/distinfo   Fri May 07 23:18:50 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/12/14 04:14:04 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/05/07 23:18:50 hubertf Exp $
 
 SHA1 (centericq-4.9.9.tar.bz2) = 4c458aacff21bd8046688516a5b484734373a7c6
 Size (centericq-4.9.9.tar.bz2) = 990786 bytes
-SHA1 (patch-aa) = b5c297628e965e7bfc6e85da51045c75fd0e21fd
+SHA1 (patch-aa) = b3e610a1a3b30a716215889b9f51c6de7e78fb22
diff -r cfe6700c2159 -r 62c9bf278c87 chat/centericq/patches/patch-aa
--- a/chat/centericq/patches/patch-aa   Fri May 07 22:47:26 2004 +0000
+++ b/chat/centericq/patches/patch-aa   Fri May 07 23:18:50 2004 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.1 2003/09/19 21:32:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/07 23:18:50 hubertf Exp $
 
---- src/icqconf.cc.orig        2003-07-25 19:03:00.000000000 +0200
+--- src/icqconf.cc.orig        2003-10-26 11:46:52.000000000 +0100
 +++ src/icqconf.cc
-@@ -414,11 +414,11 @@ void icqconf::loadsounds() {
+@@ -27,7 +27,11 @@
+ #include <dirent.h>
+ #include <fstream>
+ 
+-#ifdef __sun__
++#ifdef __NetBSD__
++/* Find out about __NetBSD_Version__ */
++#  include <sys/param.h>
++#endif
++#if defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000))
+ #include <sys/statvfs.h>
+ #endif
+ 
+@@ -427,11 +431,11 @@ void icqconf::loadsounds() {
  
            switch(rs) {
                case rscard:
@@ -19,3 +32,12 @@
                    break;
  
                case rsspeaker:
+@@ -1126,7 +1130,7 @@ unsigned int icqconf::gethttpproxyport()
+ void icqconf::checkdiskspace() {
+     fenoughdiskspace = true;
+ 
+-#ifndef __sun__
++#if !(defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000)))
+     struct statfs st;
+     if(!statfs(conf.getdirname().c_str(), &st)) {
+ #else