From owner-svn-ports-head@freebsd.org Fri Jan 27 19:26:23 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AEE2CC3FC7; Fri, 27 Jan 2017 19:26:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D5831E9C; Fri, 27 Jan 2017 19:26:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0RJQMep048386; Fri, 27 Jan 2017 19:26:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0RJQMfF048385; Fri, 27 Jan 2017 19:26:22 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701271926.v0RJQMfF048385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Jan 2017 19:26:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432565 - head/databases/mysql-proxy/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2017 19:26:23 -0000 Author: jbeich Date: Fri Jan 27 19:26:22 2017 New Revision: 432565 URL: https://svnweb.freebsd.org/changeset/ports/432565 Log: databases/mysql-proxy: unbreak with libevent >= 2.1 chassis-mainloop.c:102:54: error: use of undeclared identifier '_EVENT_VERSION' if (0 != chassis_check_version(event_get_version(), _EVENT_VERSION)) { ^ chassis-mainloop.c:104:15: error: use of undeclared identifier '_EVENT_VERSION' G_STRLOC, _EVENT_VERSION, event_get_version()); ^ /usr/local/include/glib-2.0/glib/gmessages.h:161:32: note: expanded from macro 'g_critical' __VA_ARGS__) ^ chassis-mainloop.c:119:37: error: use of undeclared identifier '_EVENT_VERSION' chas->event_hdr_version = g_strdup(_EVENT_VERSION); ^ PR: 216527 Added: head/databases/mysql-proxy/files/patch-src_chassis-mainloop.c (contents, props changed) Added: head/databases/mysql-proxy/files/patch-src_chassis-mainloop.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql-proxy/files/patch-src_chassis-mainloop.c Fri Jan 27 19:26:22 2017 (r432565) @@ -0,0 +1,40 @@ +Switch away from deprecated libevent macros. + +--- src/chassis-mainloop.c.orig 2013-12-23 22:57:16 UTC ++++ src/chassis-mainloop.c +@@ -99,9 +99,9 @@ int chassis_check_version(const char *li + chassis *chassis_new() { + chassis *chas; + +- if (0 != chassis_check_version(event_get_version(), _EVENT_VERSION)) { ++ if (0 != chassis_check_version(event_get_version(), LIBEVENT_VERSION)) { + g_critical("%s: chassis is build against libevent %s, but now runs against %s", +- G_STRLOC, _EVENT_VERSION, event_get_version()); ++ G_STRLOC, LIBEVENT_VERSION, event_get_version()); + return NULL; + } + +@@ -116,7 +116,7 @@ chassis *chassis_new() { + + chas->threads = chassis_event_threads_new(); + +- chas->event_hdr_version = g_strdup(_EVENT_VERSION); ++ chas->event_hdr_version = g_strdup(LIBEVENT_VERSION); + + chas->shutdown_hooks = chassis_shutdown_hooks_new(); + +@@ -225,10 +225,10 @@ static void event_log_use_glib(int libev + + GLogLevelFlags glib_log_level = G_LOG_LEVEL_DEBUG; + +- if (libevent_log_level == _EVENT_LOG_DEBUG) glib_log_level = G_LOG_LEVEL_DEBUG; +- else if (libevent_log_level == _EVENT_LOG_MSG) glib_log_level = G_LOG_LEVEL_MESSAGE; +- else if (libevent_log_level == _EVENT_LOG_WARN) glib_log_level = G_LOG_LEVEL_WARNING; +- else if (libevent_log_level == _EVENT_LOG_ERR) glib_log_level = G_LOG_LEVEL_CRITICAL; ++ if (libevent_log_level == EVENT_LOG_DEBUG) glib_log_level = G_LOG_LEVEL_DEBUG; ++ else if (libevent_log_level == EVENT_LOG_MSG) glib_log_level = G_LOG_LEVEL_MESSAGE; ++ else if (libevent_log_level == EVENT_LOG_WARN) glib_log_level = G_LOG_LEVEL_WARNING; ++ else if (libevent_log_level == EVENT_LOG_ERR) glib_log_level = G_LOG_LEVEL_CRITICAL; + + g_log(G_LOG_DOMAIN, glib_log_level, "(libevent) %s", msg); + }