From c60d23abda6d344e014d2457f3ab1628dc918b34 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Mon, 27 Aug 2012 05:14:55 +0000
Subject: Remove the set_debug_log_from_config patch; it was merged incorrectly
 and now breaks the build.

---
 chat/jabberd2/distinfo                 |  3 +--
 chat/jabberd2/patches/patch-util_log_c | 15 ---------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 chat/jabberd2/patches/patch-util_log_c

(limited to 'chat')

diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 04860177740..3a0bcfc2859 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2012/08/26 18:25:47 adam Exp $
+$NetBSD: distinfo,v 1.31 2012/08/27 05:14:55 dholland Exp $
 
 SHA1 (jabberd-2.2.17.tar.xz) = 2b94707e0a06d07ba0329760d308460edf0f1cd8
 RMD160 (jabberd-2.2.17.tar.xz) = 4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2
@@ -7,4 +7,3 @@ SHA1 (patch-Makefile.in) = 9cdc341d764b28d331b51fb5a559afbc0b3e952b
 SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
 SHA1 (patch-s2s_out.c) = c72be21c425b56345eb8a79284b4e4aaf18c0d65
 SHA1 (patch-sm_mod_roster.c) = f43d80c2abfd31d99016b4738a717d3c6db183ce
-SHA1 (patch-util_log_c) = d7a5c6f8b0fe04be2ef53ed941100ca9dc53e9be
diff --git a/chat/jabberd2/patches/patch-util_log_c b/chat/jabberd2/patches/patch-util_log_c
deleted file mode 100644
index ec55194c1e2..00000000000
--- a/chat/jabberd2/patches/patch-util_log_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-util_log_c,v 1.2 2012/08/26 18:25:47 adam Exp $
-
-Provide set_debug_log_from_config() when DEBUG is turned off; avoids
-link failure.
-
---- util/log.c.orig	2012-05-05 13:54:17.000000000 +0000
-+++ util/log.c
-@@ -266,4 +266,7 @@ void set_debug_flag(int v)
- 
- void set_debug_log_from_config(config_t c)
- { }
-+
-+int set_debug_log_from_config(config_t c)
-+{ return 0; }
- #endif
-- 
cgit v1.2.3