$NetBSD: patch-aa,v 1.3 2009/12/15 08:29:35 jnemeth Exp $ --- src/icqconf.cc.orig 2009-08-09 06:41:55.000000000 -0700 +++ src/icqconf.cc @@ -28,7 +28,11 @@ #include -#if defined(__sun__) || defined(__NetBSD__) || defined(__sgi__) +#ifdef __NetBSD__ +/* Find out about __NetBSD_Version__ */ +# include +#endif +#if defined(__sun) || defined(__sgi) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)) #include #endif @@ -920,12 +924,12 @@ void icqconf::loadsounds() { switch(rs) { case rscard: - fo << "*\tmsg\taplay " << SHARE_DIR << "/msg.wav" << endl; - fo << "*\turl\taplay " << SHARE_DIR << "/url.wav" << endl; - fo << "*\temail\taplay " << SHARE_DIR << "/email.wav" << endl; - fo << "*\tonline\taplay " << SHARE_DIR << "/online.wav" << endl; - fo << "*\toffline\taplay " << SHARE_DIR << "/offline.wav" << endl; - fo << "*\tsms\taplay " << SHARE_DIR << "/sms.wav" << endl; + fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl; + fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl; + fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl; + fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl; + fo << "*\toffline\t" AUDIO_PLAYER " " << SHARE_DIR << "/offline.wav" << endl; + fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl; break; case rsspeaker: @@ -1870,7 +1874,7 @@ string icqconf::gethttpproxypasswd() con void icqconf::checkdiskspace() { fenoughdiskspace = true; -#if !(defined(__sun__) || defined(__NetBSD__) || defined(__sgi__)) +#if !(defined(__sun) || defined(__sgi) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))) struct statfs st; if(!statfs(conf->getdirname().c_str(), &st)) { #else