diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-01 13:56:00 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-01 13:56:00 +0000 |
| commit | 8c509a30f11437a11b57ae2c72ad292fd31a07cb (patch) | |
| tree | 02aec4712c773ebca4c71eb513307f22a30ceeae /chat | |
| parent | 8144e929aa693b678722f15ee6f8ff2150e35656 (diff) | |
| download | pkgsrc-8c509a30f11437a11b57ae2c72ad292fd31a07cb.tar.gz | |
Fixed some pkglint warnings. On Solaris, querying the __sun macro
instead of __sun__ is preferred.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/centericq/Makefile | 9 | ||||
| -rw-r--r-- | chat/centericq/distinfo | 4 | ||||
| -rw-r--r-- | chat/centericq/patches/patch-aa | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index d1ab2201367..9711df9871a 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.59 2006/03/04 21:29:02 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2006/10/01 13:56:00 rillig Exp $ # DISTNAME= centericq-4.21.0 -CATEGORIES= chat PKGREVISION= 2 +CATEGORIES= chat MASTER_SITES= http://konst.org.ua/download/ \ http://centericq.de/archive/source/releases/ EXTRACT_SUFX= .tar.bz2 @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config +CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config LIBS+= ${LDFLAGS} REPLACE_PERL= misc/cicqconv @@ -33,13 +33,12 @@ INCOMPAT_CURSES+= NetBSD-2.*-* NetBSD-3.*-* # see PR 29060 CPPFLAGS+= -DAUDIO_PLAYER="\"/usr/bin/audioplay\"" .else DEPENDS+= sox>=12.17.4:../../audio/sox -SOX_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= SOX_PREFIX=sox CPPFLAGS+= -DAUDIO_PLAYER="\"${SOX_PREFIX}/bin/play\"" .endif .if !empty(MACHINE_ARCH:Msparc64) -GCC_REQD+= 3.0 # see PR 29185 +GCC_REQD+= 3.0 # see PR 29185 .endif .include "../../converters/libiconv/buildlink3.mk" diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo index 4ce819f5eff..697d4fb72b2 100644 --- a/chat/centericq/distinfo +++ b/chat/centericq/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2005/12/03 17:04:23 adrianp Exp $ +$NetBSD: distinfo,v 1.21 2006/10/01 13:56:00 rillig Exp $ SHA1 (centericq-4.21.0.tar.bz2) = 26b07c4bdcbe8c6888ceab98140b33007bec8554 RMD160 (centericq-4.21.0.tar.bz2) = 69207fcaf5c90b9ae4609221526b839659c5ccfc Size (centericq-4.21.0.tar.bz2) = 1422126 bytes -SHA1 (patch-aa) = ba75c486f52d17cb9a0bf8354bf6b01b065b6716 +SHA1 (patch-aa) = 244ccb35ceb53715af2134d27ab4c591ed62dd30 SHA1 (patch-ab) = 6d9beb28024666bbfef2e95cab648d7058f8136c SHA1 (patch-ac) = 74ae25e19bf5d250a407a937bf78405b38cc86da SHA1 (patch-ad) = be8ba5c952bf560b0758c97ba81c4faef04ffe49 diff --git a/chat/centericq/patches/patch-aa b/chat/centericq/patches/patch-aa index 441e0fe5d0d..8a563ee5707 100644 --- a/chat/centericq/patches/patch-aa +++ b/chat/centericq/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2005/09/06 08:10:57 abs Exp $ +$NetBSD: patch-aa,v 1.5 2006/10/01 13:56:01 rillig Exp $ --- src/icqconf.cc.orig 2005-01-27 00:52:47.000000000 +0100 +++ src/icqconf.cc @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/09/06 08:10:57 abs Exp $ +/* Find out about __NetBSD_Version__ */ +# include <sys/param.h> +#endif -+#if defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)) ++#if defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)) #include <sys/statvfs.h> #endif @@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.4 2005/09/06 08:10:57 abs Exp $ fenoughdiskspace = true; -#ifndef __sun__ -+#if !(defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))) ++#if !(defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))) struct statfs st; if(!statfs(conf.getdirname().c_str(), &st)) { #else |