From sunpoet@sunpoet.net  Fri Feb 28 09:37:01 2014
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id B448B1000;
	Fri, 28 Feb 2014 09:37:01 +0000 (UTC)
Received: from sunpoet.net (sunpoet.net [220.135.71.135])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 8269D157A;
	Fri, 28 Feb 2014 09:37:01 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 6A5E03657; Fri, 28 Feb 2014 17:37:50 +0800 (CST)
Message-Id: <20140228093750.6A5E03657@sunpoet.net>
Date: Fri, 28 Feb 2014 17:37:50 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ale@FreeBSD.org
Subject: [PATCH] databases/mysql56-client: install missing hash.h to fix build failure of ports which includes sql_common.h
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         187131
>Category:       ports
>Synopsis:       [PATCH] databases/mysql56-client: install missing hash.h to fix build failure of ports which includes sql_common.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 28 09:40:00 UTC 2014
>Closed-Date:    Fri Feb 28 13:52:20 UTC 2014
>Last-Modified:  Fri Feb 28 14:00:00 UTC 2014
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 10.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 10.0-STABLE FreeBSD 10.0-STABLE #0 r261402: Mon Feb  3 22:35:15
>Description:
${PREFIX}/include/mysql/sql_common.h includes hash.h which is in mysql 5.6.x
source as include/hash.h. However, hash.h was not installed thus some ports
fail to build, e.g. databases/mydumper.

Port maintainer (ale@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: SVN)
>How-To-Repeat:
% cd /usr/ports/databases/mysql56-client; make install
% cd /usr/ports/databases/mydumper; make install
...
In file included from /usr/ports/works/usr/ports/databases/mydumper/work/mydumper-0.5.2/binlog.c:27:
/usr/local/include/mysql/sql_common.h:26:10: fatal error: 'hash.h' file not found
#include <hash.h>
         ^
1 warning and 1 error generated.
*** [CMakeFiles/mydumper.dir/binlog.c.o] Error code 1

% pkg which /usr/local/include/mysql/sql_common.h
/usr/local/include/mysql/sql_common.h was installed by package mysql56-client-5.6.16
>Fix:

--- mysql56-client-5.6.16.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 346473)
+++ Makefile	(working copy)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
+PORTREVISION=	1
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
Index: files/patch-include-CMakeLists.txt
===================================================================
--- files/patch-include-CMakeLists.txt	(revision 0)
+++ files/patch-include-CMakeLists.txt	(working copy)
@@ -0,0 +1,10 @@
+--- include/CMakeLists.txt.orig	2014-01-14 23:38:00.000000000 +0800
++++ include/CMakeLists.txt	2014-02-28 04:51:50.269412818 +0800
+@@ -35,6 +35,7 @@
+ 
+ SET(HEADERS 
+   ${HEADERS_ABI} 
++  hash.h
+   my_dbug.h 
+   m_string.h
+   my_sys.h 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 346473)
+++ pkg-plist	(working copy)
@@ -19,6 +19,7 @@
 include/mysql/byte_order_generic_x86_64.h
 include/mysql/decimal.h
 include/mysql/errmsg.h
+include/mysql/hash.h
 include/mysql/keycache.h
 include/mysql/little_endian.h
 include/mysql/m_ctype.h
--- mysql56-client-5.6.16.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Feb 28 09:40:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187131 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Fri Feb 28 13:52:19 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187131 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187131: commit references a PR
Date: Fri, 28 Feb 2014 13:52:06 +0000 (UTC)

 Author: sunpoet
 Date: Fri Feb 28 13:51:58 2014
 New Revision: 346515
 URL: http://svnweb.freebsd.org/changeset/ports/346515
 QAT: https://qat.redports.org/buildarchive/r346515/
 
 Log:
   - Install hash.h
   - Bump PORTREVISION for package change
   
   PR:		ports/187131
   Submitted by:	sunpoet (myself)
   Approved by:	ale (maintainer)
 
 Added:
   head/databases/mysql56-client/files/patch-include-CMakeLists.txt   (contents, props changed)
 Modified:
   head/databases/mysql56-client/Makefile
   head/databases/mysql56-client/pkg-plist
 
 Modified: head/databases/mysql56-client/Makefile
 ==============================================================================
 --- head/databases/mysql56-client/Makefile	Fri Feb 28 13:45:48 2014	(r346514)
 +++ head/databases/mysql56-client/Makefile	Fri Feb 28 13:51:58 2014	(r346515)
 @@ -2,6 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	mysql
 +PORTREVISION=	1
  PKGNAMESUFFIX=	56-client
  
  COMMENT=	Multithreaded SQL database (client)
 
 Added: head/databases/mysql56-client/files/patch-include-CMakeLists.txt
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/mysql56-client/files/patch-include-CMakeLists.txt	Fri Feb 28 13:51:58 2014	(r346515)
 @@ -0,0 +1,10 @@
 +--- include/CMakeLists.txt.orig	2014-01-14 23:38:00.000000000 +0800
 ++++ include/CMakeLists.txt	2014-02-28 04:51:50.269412818 +0800
 +@@ -35,6 +35,7 @@
 + 
 + SET(HEADERS 
 +   ${HEADERS_ABI} 
 ++  hash.h
 +   my_dbug.h 
 +   m_string.h
 +   my_sys.h 
 
 Modified: head/databases/mysql56-client/pkg-plist
 ==============================================================================
 --- head/databases/mysql56-client/pkg-plist	Fri Feb 28 13:45:48 2014	(r346514)
 +++ head/databases/mysql56-client/pkg-plist	Fri Feb 28 13:51:58 2014	(r346515)
 @@ -19,6 +19,7 @@ include/mysql/byte_order_generic_x86.h
  include/mysql/byte_order_generic_x86_64.h
  include/mysql/decimal.h
  include/mysql/errmsg.h
 +include/mysql/hash.h
  include/mysql/keycache.h
  include/mysql/little_endian.h
  include/mysql/m_ctype.h
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
