diff options
| author | hubertf <hubertf@pkgsrc.org> | 2004-05-07 23:18:50 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2004-05-07 23:18:50 +0000 |
| commit | 23f5045d897dce64ababa3b71316e4df49cd5366 (patch) | |
| tree | 3b4e89795477c2c439d0772eb43200032ba05737 /chat | |
| parent | 6ae7673bf6dad3200a5631e3f29398b4f4957b34 (diff) | |
| download | pkgsrc-23f5045d897dce64ababa3b71316e4df49cd5366.tar.gz | |
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 (limited to 'chat')
| -rw-r--r-- | chat/centericq/Makefile | 4 | ||||
| -rw-r--r-- | chat/centericq/distinfo | 4 | ||||
| -rw-r--r-- | chat/centericq/patches/patch-aa | 28 |
3 files changed, 29 insertions, 7 deletions
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index c09c37acd31..3456f0ed2a8 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -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 --git a/chat/centericq/distinfo b/chat/centericq/distinfo index 9e4a18b1b2c..b08e5eda7ea 100644 --- a/chat/centericq/distinfo +++ b/chat/centericq/distinfo @@ -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 --git a/chat/centericq/patches/patch-aa b/chat/centericq/patches/patch-aa index 9983ac8d8aa..47ccab6e2ac 100644 --- a/chat/centericq/patches/patch-aa +++ b/chat/centericq/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.1 2003/09/19 21:32:13 jmmv Exp $ 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 |