From owner-freebsd-ports-bugs@FreeBSD.ORG  Mon Apr 20 10:31:53 2015
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9F7C7AD
 for <freebsd-ports-bugs@FreeBSD.org>; Mon, 20 Apr 2015 10:31:53 +0000 (UTC)
Received: from kenobi.freebsd.org (kenobi.freebsd.org
 [IPv6:2001:1900:2254:206a::16:76])
 (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 8929CBF8
 for <freebsd-ports-bugs@FreeBSD.org>; Mon, 20 Apr 2015 10:31:53 +0000 (UTC)
Received: from bugs.freebsd.org ([127.0.1.118])
 by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id t3KAVr47084158
 for <freebsd-ports-bugs@FreeBSD.org>; Mon, 20 Apr 2015 10:31:53 GMT
 (envelope-from bugzilla-noreply@freebsd.org)
From: bugzilla-noreply@freebsd.org
To: freebsd-ports-bugs@FreeBSD.org
Subject: [Bug 199556] databases/mariadb100-client patch for several path errors
Date: Mon, 20 Apr 2015 10:31:53 +0000
X-Bugzilla-Reason: AssignedTo
X-Bugzilla-Type: new
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: Ports & Packages
X-Bugzilla-Component: Individual Port(s)
X-Bugzilla-Version: Latest
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: Affects Many People
X-Bugzilla-Who: zaphod@berentweb.com
X-Bugzilla-Status: New
X-Bugzilla-Priority: ---
X-Bugzilla-Assigned-To: freebsd-ports-bugs@FreeBSD.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: maintainer-feedback?
X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform
 op_sys bug_status bug_severity priority component assigned_to reporter cc
 flagtypes.name
Message-ID: <bug-199556-13@https.bugs.freebsd.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Apr 2015 10:31:53 -0000

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199556

            Bug ID: 199556
           Summary: databases/mariadb100-client patch for several path
                    errors
           Product: Ports & Packages
           Version: Latest
          Hardware: amd64
                OS: Any
            Status: New
          Severity: Affects Many People
          Priority: ---
         Component: Individual Port(s)
          Assignee: freebsd-ports-bugs@FreeBSD.org
          Reporter: zaphod@berentweb.com
                CC: spil.oss@gmail.com
                CC: spil.oss@gmail.com
             Flags: maintainer-feedback?(spil.oss@gmail.com)

I came accross this bug while trying to build databases/mysql-udf, which would
fail to compile with "fatal error: 'mysql/<module_name>' file not found".
Examination of the mariadb100-client modules showed path-prefix being specified
in the "#include" statements. Removing the "mysql/" prefix corrects the
problem.

My patch does not resolve all path problems (I did NOT do a grep search through
all files in the mysql folder), it only addresses path issues with regards to
compiling databases/mysql-udf. Other path issues may exist.

The semi-patch for this path problem is:

#1: include/my_global.h
@@ -1033 +1033 @@
- #include <mysql/plugin.h>  /* my_bool */
+ #include <plugin.h>  /* my_bool */

#2: include/mysql/plugin.h
@@ -51 +51 @@
- #include <mysql/services.h>
+ #include <services.h>

#3: include/mysql/services.h
@@ -22,32 +22,32 @@
- #include <mysql/service_my_snprintf.h>
- #include <mysql/service_thd_alloc.h>
- #include <mysql/service_thd_wait.h>
- #include <mysql/service_progress_report.h>
- #include <mysql/service_debug_sync.h>
- #include <mysql/service_kill_statement.h>
- #include <mysql/service_thd_timezone.h>
- #include <mysql/service_sha1.h>
- #include <mysql/service_logger.h>
- #include <mysql/service_thd_autoinc.h>
- #include <mysql/service_thd_error_context.h>
+ #include <service_my_snprintf.h>
+ #include <service_thd_alloc.h>
+ #include <service_thd_wait.h>
+ #include <service_progress_report.h>
+ #include <service_debug_sync.h>
+ #include <service_kill_statement.h>
+ #include <service_thd_timezone.h>
+ #include <service_sha1.h>
+ #include <service_logger.h>
+ #include <service_thd_autoinc.h>
+ #include <service_thd_error_context.h>

#4: include/mysql/my_pthread.h
@@ -721 +721 @@
- #include <mysql/psi/mysql_thread.h>
+ #include <psi/mysql_thread.h>

#5: include/mysql/psi/mysql_thread.h
@@ -57 +57 @@
- #include "mysql/psi/psi.h"
+ #include "psi/psi.h"

#6: include/mysql/my_sys.h
@@ -42, +42 @@
- #include <mysql/plugin.h>
+ #include <plugin.h> 

@@ -1010, +1010 @@
- #include <mysql/psi/psi.h>
+ #include <psi/psi.h>

#7: include/mysql/m_string.h
@@ -207 +207 @@
- #include <mysql/plugin.h>
+ #include <plugin.h>

-- 
You are receiving this mail because:
You are the assignee for the bug.