ports/146276: [PATCH] databases/mysql-server: fix vendor include/mysql/ layout snafus

[Philip M. Gollucci]

>Number:         146276
>Category:       ports
>Synopsis:       [PATCH] databases/mysql-server: fix vendor include/mysql/ layout snafus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 03 23:10:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010
>Description:
MySQL (AB/Sun/Oracle) goofed this to smither renes.

The src tree is organized but the install tree is flattened.

http://bugs.mysql.com/bug.php?id=51925

This at the very least lets devel/apr compile with WITH_MYSQL_VER=55

As it stands, it doesn't even work with itself (mumble)
cd /usr/local/include/myql
grep psi *

3.x 4.x, 5.[01].x do not have this issue.


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

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mysql-server-5.5.4_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mysql55-server/Makefile,v
retrieving revision 1.260
diff -u -u -r1.260 Makefile
--- Makefile	16 Apr 2010 09:18:51 -0000	1.260
+++ Makefile	3 May 2010 22:48:13 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.5.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
@@ -197,6 +197,9 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+	${MKDIR} ${PREFIX}/include/mysql/psi
+	${LN} -s ${PREFIX}/include/mysql/psi.h ${PREFIX}/include/mysql/psi/psi.h
+	${LN} -s ${PREFIX}/include/mysql/mysql_thread.h ${PREFIX}/include/mysql/psi/mysql_thread.h
 
 .else
 # MySQL-Scripts part
Index: pkg-plist.client
===================================================================
RCS file: /home/ncvs/ports/databases/mysql55-server/pkg-plist.client,v
retrieving revision 1.38
diff -u -u -r1.38 pkg-plist.client
--- pkg-plist.client	13 Apr 2010 15:12:33 -0000	1.38
+++ pkg-plist.client	3 May 2010 22:51:04 -0000
@@ -63,6 +63,12 @@
 lib/mysql/libmysqlclient_r.so.16
 share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
- at dirrm include/mysql
 @dirrm lib/mysql
 @dirrm %%DATADIR%%
+ at exec mkdir %D/include/mysql/psi
+ at exec ln -fs %D/include/mysql/mysql_thread.h %D/include/mysql/psi/mysql_thread.h
+ at exec ln -fs %D/include/mysql/psi.h %D/include/mysql/psi/psi.h
+ at unexec rm -f %D/include/mysql/psi/mysql_thread.h
+ at unexec rm -f %D/include/mysql/psi/psi.h
+ at dirrm include/mysql/psi
+ at dirrm include/mysql
--- mysql-server-5.5.4_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: