From 5dc764e28626c80042a70a871a48d6c5047055f5 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Mon, 19 May 2014 09:34:34 +0000
Subject: Apply a number of changes:

 * Install a dummy log handler to avoid spamming e.g. the irssi-xmpp console
   window in non-debug mode, patch from:

    https://github.com/mcabber/loudmouth/commit/65fda2c884f2cd70096def29fde5c6b9c1e70ecb

 * Fix build on Darwin

 * Add patch comments and LICENSE.

Bump PKGREVISION.
---
 chat/loudmouth/Makefile                           |  5 ++--
 chat/loudmouth/distinfo                           |  6 +++--
 chat/loudmouth/patches/patch-aa                   |  4 +++-
 chat/loudmouth/patches/patch-loudmouth_lm-debug.c | 28 +++++++++++++++++++++++
 chat/loudmouth/patches/patch-loudmouth_lm-sock.c  | 19 +++++++++++++++
 5 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 chat/loudmouth/patches/patch-loudmouth_lm-debug.c
 create mode 100644 chat/loudmouth/patches/patch-loudmouth_lm-sock.c

(limited to 'chat')

diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index 35be07c04ef..d486f3546d8 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/02/12 23:17:37 tron Exp $
+# $NetBSD: Makefile,v 1.41 2014/05/19 09:34:34 jperkin Exp $
 
 DISTNAME=	loudmouth-1.4.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/loudmouth/1.4/}
 
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.loudmouth-project.org/
 COMMENT=	Lightweight Jabber client library
+LICENSE=	gnu-lgpl-v2.1
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
diff --git a/chat/loudmouth/distinfo b/chat/loudmouth/distinfo
index 63e3c4b2241..6b886b18046 100644
--- a/chat/loudmouth/distinfo
+++ b/chat/loudmouth/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.16 2012/05/06 17:41:40 dholland Exp $
+$NetBSD: distinfo,v 1.17 2014/05/19 09:34:34 jperkin Exp $
 
 SHA1 (loudmouth-1.4.3.tar.bz2) = 55dd0475760f98ff0ba1f5c712c52ab776b432be
 RMD160 (loudmouth-1.4.3.tar.bz2) = 59852d085f73d68b3c061b7192a484527843e67d
 Size (loudmouth-1.4.3.tar.bz2) = 366818 bytes
-SHA1 (patch-aa) = e45b47920468f681b53a4a6eb718a789c6eb0248
+SHA1 (patch-aa) = d23b8671b8d15a0be257f9fd3d5fb55df33edf14
+SHA1 (patch-loudmouth_lm-debug.c) = 59c73bfeb1cbd66ff8c7325353f4772cfdc0c891
 SHA1 (patch-loudmouth_lm-error_c) = 479f2b469b6430d7743b270a9d70fde5829c6c56
+SHA1 (patch-loudmouth_lm-sock.c) = 7271b8045c0ce303504d3ddb59d1a08489a721ce
diff --git a/chat/loudmouth/patches/patch-aa b/chat/loudmouth/patches/patch-aa
index 5ae964ae3df..0af366981a9 100644
--- a/chat/loudmouth/patches/patch-aa
+++ b/chat/loudmouth/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2009/03/11 08:26:11 hasso Exp $
+$NetBSD: patch-aa,v 1.6 2014/05/19 09:34:34 jperkin Exp $
+
+Don't hardcode -lresolv
 
 --- loudmouth/Makefile.in.orig	2009-03-11 09:40:29 +0200
 +++ loudmouth/Makefile.in	2009-03-11 09:40:42 +0200
diff --git a/chat/loudmouth/patches/patch-loudmouth_lm-debug.c b/chat/loudmouth/patches/patch-loudmouth_lm-debug.c
new file mode 100644
index 00000000000..a334217df61
--- /dev/null
+++ b/chat/loudmouth/patches/patch-loudmouth_lm-debug.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-loudmouth_lm-debug.c,v 1.1 2014/05/19 09:34:34 jperkin Exp $
+
+Apply patch from
+
+  https://github.com/mcabber/loudmouth/commit/65fda2c884f2cd70096def29fde5c6b9c1e70ecb
+
+to avoid logging spam in the non-debug case.
+
+--- loudmouth/lm-debug.c.orig	2008-10-29 13:45:10.000000000 +0000
++++ loudmouth/lm-debug.c
+@@ -88,9 +88,17 @@ lm_debug_init (void)
+ 
+ #else  /* LM_NO_DEBUG */
+ 
++static void
++do_nothing_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
++			const gchar *message, gpointer user_data)
++{
++}
++
+ void 
+ lm_debug_init (void)
+ {
++	g_log_set_handler (LM_LOG_DOMAIN, LM_LOG_LEVEL_ALL,
++			   do_nothing_log_handler, NULL);
+ }
+ 
+ #endif /* LM_NO_DEBUG */
diff --git a/chat/loudmouth/patches/patch-loudmouth_lm-sock.c b/chat/loudmouth/patches/patch-loudmouth_lm-sock.c
new file mode 100644
index 00000000000..39a4e73dc71
--- /dev/null
+++ b/chat/loudmouth/patches/patch-loudmouth_lm-sock.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-loudmouth_lm-sock.c,v 1.1 2014/05/19 09:34:34 jperkin Exp $
+
+Darwin does not have TCP_KEEPIDLE.
+
+--- loudmouth/lm-sock.c.orig	2008-10-29 13:45:10.000000000 +0000
++++ loudmouth/lm-sock.c
+@@ -325,10 +325,12 @@ _lm_sock_set_keepalive (LmSocketT sock, 
+ 		return FALSE;
+ 	}
+ 
++#ifndef __APPLE__
+ 	opt = delay;
+ 	if (setsockopt (sock, IPPROTO_TCP, TCP_KEEPIDLE, &opt, sizeof (opt)) < 0) {
+ 		return FALSE;
+ 	}
++#endif
+ 
+ 	opt = delay; 
+ 	if (setsockopt (sock, IPPROTO_TCP, TCP_KEEPINTVL, &opt, sizeof (opt)) < 0) {
-- 
cgit v1.2.3