[PATCH] centericq: Fix Jabber plugin, make gpgme optional

[Jonathan Schleifer <js%h3c.de@localhost>]

This patch makes gpgme an optional in centericq.
Additionally, this removes a deprecated request from the Jabber plugin
so that it works with ejabberd servers.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/centericq/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- Makefile    7 Jan 2007 09:13:48 -0000       1.63
+++ Makefile    19 Feb 2007 14:54:04 -0000
@@ -12,15 +12,26 @@
 HOMEPAGE=      http://thekonst.net/eng/software/centericq/info.html
 COMMENT=       Instant Messenger interface supporting many protocols
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.centericq
+PKG_SUPPORTED_OPTIONS= gpgme
+
+.include "../../mk/bsd.options.mk"
+
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake perl:run
 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
 LIBS+=                 ${LDFLAGS}
 
+.if !empty(PKG_OPTIONS:Mgpgme)
+CONFIGURE_ARGS+=        --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
+.include "../../security/gpgme/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-gpgme
+.endif
+
 REPLACE_PERL=          misc/cicqconv
 
 INCOMPAT_CURSES+=      NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
@@ -44,7 +55,6 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/centericq/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo    1 Oct 2006 13:56:00 -0000       1.21
+++ distinfo    19 Feb 2007 14:54:04 -0000
@@ -23,3 +23,4 @@
 SHA1 (patch-ar) = b06ba8fad9a2dbcfacb0c81e2689cca02a38dd01
 SHA1 (patch-as) = 55822a88a4fd17e57a06f0f186a6649fe3e4b092
 SHA1 (patch-at) = 7dd7158371940522c7d393ea8d9194c2e4154cf8
+SHA1 (patch-au) = 2b9e8d00b22373e8cfbef0ea279ad60212ddd6c7

And here the new patches/patch-au file:
$NetBSD$

--- src/hooks/jabberhook.cc.orig        2007-02-19 15:08:26.000000000 +0100
+++ src/hooks/jabberhook.cc     2007-02-19 15:08:38.000000000 +0100
@@ -887,11 +887,6 @@
 void jabberhook::gotloggedin() {
     xmlnode x;
 
-    x = jutil_iqnew(JPACKET__GET, NS_AGENTS);
-    xmlnode_put_attrib(x, "id", "Agent List");
-    jab_send(jc, x);
-    xmlnode_free(x);
-
     x = jutil_iqnew(JPACKET__GET, NS_ROSTER);
     xmlnode_put_attrib(x, "id", "Roster");
     jab_send(jc, x);

Please test & commit.

-- 
Jonathan