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
-@dirrm include/mysql
 @dirrm lib/mysql
 @dirrm %%DATADIR%%
+@exec mkdir %D/include/mysql/psi
+@exec ln -fs %D/include/mysql/mysql_thread.h %D/include/mysql/psi/mysql_thread.h
+@exec ln -fs %D/include/mysql/psi.h %D/include/mysql/psi/psi.h
+@unexec rm -f %D/include/mysql/psi/mysql_thread.h
+@unexec rm -f %D/include/mysql/psi/psi.h
+@dirrm include/mysql/psi
+@dirrm include/mysql