5 files changed, 8 insertions, 37 deletions

diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 861f8358076d..fb471d1dea78 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/percona55-client/files/patch-include_CMakeLists.txt b/databases/percona55-client/files/patch-include_CMakeLists.txt
index 58c94b7e542b..02ae2db9f708 100644
--- a/databases/percona55-client/files/patch-include_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-include_CMakeLists.txt
@@ -1,5 +1,5 @@
---- include/CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ include/CMakeLists.txt	2010-12-23 16:16:14.000000000 +0100
+--- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt	2011-02-07 22:42:05.129894470 +0100
 @@ -27,9 +27,6 @@
    my_list.h
    my_alloc.h
@@ -10,11 +10,3 @@
  )
  
  SET(HEADERS 
-@@ -59,6 +56,6 @@
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}  COMPONENT Development FILES_MATCHING PATTERN "*.h" )
-+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
- 
- 
diff --git a/databases/percona55-client/files/patch-scripts_mysql_config.sh b/databases/percona55-client/files/patch-scripts_mysql_config.sh
deleted file mode 100644
index 20c6646dac34..000000000000
--- a/databases/percona55-client/files/patch-scripts_mysql_config.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- scripts/mysql_config.sh.orig	2010-12-23 15:57:56.000000000 +0100
-+++ scripts/mysql_config.sh	2010-12-23 15:58:49.000000000 +0100
-@@ -92,7 +92,11 @@
- fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
- 
- pkgincludedir='@pkgincludedir@'
--fix_path pkgincludedir include/mysql include
-+if [ -f "$basedir/include/mysql/mysql.h" ]; then
-+  pkgincludedir="$basedir/include/mysql"
-+elif [ -f "$basedir/include/mysql.h" ]; then
-+  pkgincludedir="$basedir/include"
-+fi
- 
- version='@VERSION@'
- socket='@MYSQL_UNIX_ADDR@'
diff --git a/databases/percona55-client/files/patch-support-files_CMakeLists.txt b/databases/percona55-client/files/patch-support-files_CMakeLists.txt
index 283d969747f8..e3490b326b03 100644
--- a/databases/percona55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 13:26:23.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 13:29:45.000000000 +0100
-@@ -40,12 +40,14 @@
+--- support-files/CMakeLists.txt.orig	2011-01-19 23:37:09.000000000 +0100
++++ support-files/CMakeLists.txt	2011-02-07 22:52:05.238344276 +0100
+@@ -40,15 +40,18 @@
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
  
@@ -14,16 +14,12 @@
 +ENDIF()
  
  IF(UNIX)
-   # XXX: again, used elsewhere (scripts/), should be standardised in
-@@ -56,6 +58,7 @@
-     SET(prefix ${CMAKE_INSTALL_PREFIX})
-   ENDIF()
-  
+   SET(prefix ${CMAKE_INSTALL_PREFIX})
 +IF(FALSE)
    FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
      config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -73,8 +76,10 @@
+@@ -66,8 +69,10 @@
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
@@ -34,7 +30,7 @@
    CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
    CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
    CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
-@@ -92,3 +97,4 @@
+@@ -85,3 +90,4 @@
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()
diff --git a/databases/percona55-client/pkg-plist b/databases/percona55-client/pkg-plist
index 9949a27a50e9..7322ec5e5bf2 100644
--- a/databases/percona55-client/pkg-plist
+++ b/databases/percona55-client/pkg-plist
@@ -27,7 +27,6 @@ include/mysql/my_getopt.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
-include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h