Attachment 113062 Details for Bug 154579 – file.diff

[patch] file.diff

file.diff (text/plain), 7.58 KB, created by Martin Matuska on 2011-02-07 22:30:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2011-02-07 22:30:08 UTC

Size: 7.58 KB

patch

obsolete

>Index: ports/databases/mysql55-client/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-client/Makefile,v
>retrieving revision 1.107
>diff -u -r1.107 Makefile
>--- ports/databases/mysql55-client/Makefile	13 Jan 2011 09:15:22 -0000	1.107
>+++ ports/databases/mysql55-client/Makefile	7 Feb 2011 22:14:16 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mysql
>-PORTREVISION=	2
>+PORTREVISION=	0
> PKGNAMESUFFIX=	-client
> 
> COMMENT=	Multithreaded SQL database (client)
>Index: ports/databases/mysql55-client/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-client/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- ports/databases/mysql55-client/pkg-plist	11 Jan 2011 20:33:38 -0000	1.2
>+++ ports/databases/mysql55-client/pkg-plist	7 Feb 2011 22:14:16 -0000
>@@ -27,7 +27,6 @@
> 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
>Index: ports/databases/mysql55-client/files/patch-include_CMakeLists.txt
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-client/files/patch-include_CMakeLists.txt,v
>retrieving revision 1.1
>diff -u -r1.1 patch-include_CMakeLists.txt
>--- ports/databases/mysql55-client/files/patch-include_CMakeLists.txt	27 Dec 2010 15:02:37 -0000	1.1
>+++ ports/databases/mysql55-client/files/patch-include_CMakeLists.txt	7 Feb 2011 22:14:16 -0000
>@@ -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")
>- 
>- 
>Index: ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh
>===================================================================
>RCS file: ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh
>diff -N ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh
>--- ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh	27 Dec 2010 15:02:37 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -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@'
>Index: ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt,v
>retrieving revision 1.1
>diff -u -r1.1 patch-support-files_CMakeLists.txt
>--- ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt	27 Dec 2010 15:02:37 -0000	1.1
>+++ ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt	7 Feb 2011 22:14:16 -0000
>@@ -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()
>Index: ports/databases/mysql55-server/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/Makefile,v
>retrieving revision 1.272
>diff -u -r1.272 Makefile
>--- ports/databases/mysql55-server/Makefile	13 Jan 2011 09:15:22 -0000	1.272
>+++ ports/databases/mysql55-server/Makefile	7 Feb 2011 22:14:16 -0000
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	5.5.8
>-PORTREVISION?=	3
>+PORTVERSION=	5.5.9
>+PORTREVISION?=	0
> CATEGORIES=	databases ipv6
> MASTER_SITES=	${MASTER_SITE_MYSQL}
> MASTER_SITE_SUBDIR=	MySQL-5.5
>Index: ports/databases/mysql55-server/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/distinfo,v
>retrieving revision 1.126
>diff -u -r1.126 distinfo
>--- ports/databases/mysql55-server/distinfo	27 Dec 2010 15:02:38 -0000	1.126
>+++ ports/databases/mysql55-server/distinfo	7 Feb 2011 22:14:16 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (mysql-5.5.8.tar.gz) = e1175da267e8124507d69a259e144e59043f03e7a7cff81185f412cb1d6bcda2
>-SIZE (mysql-5.5.8.tar.gz) = 24258297
>+SHA256 (mysql-5.5.9.tar.gz) = 2352ec7103aa302619242eb8f20fd3b7a12ba8abc55076ac7285b4d845cc96fd
>+SIZE (mysql-5.5.9.tar.gz) = 23841228
>Index: ports/databases/mysql55-server/files/patch-include_CMakeLists.txt
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/files/patch-include_CMakeLists.txt,v
>retrieving revision 1.1
>diff -u -r1.1 patch-include_CMakeLists.txt
>--- ports/databases/mysql55-server/files/patch-include_CMakeLists.txt	27 Dec 2010 15:02:38 -0000	1.1
>+++ ports/databases/mysql55-server/files/patch-include_CMakeLists.txt	7 Feb 2011 22:14:16 -0000
>@@ -1,12 +1,10 @@
>---- include/CMakeLists.txt.orig	2010-12-23 16:09:41.000000000 +0100
>-+++ include/CMakeLists.txt	2010-12-23 16:10:01.000000000 +0100
>-@@ -58,7 +58,9 @@
>+--- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
>++++ include/CMakeLists.txt	2011-02-07 22:40:32.698758463 +0100
>+@@ -57,5 +57,7 @@
>    ${HEADERS_GEN_CONFIGURE}
>  )
>  
> +IF(FALSE)
>  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")
> +ENDIF()
>- 
>-

Actions: View | Diff

Attachments on bug 154579: 113062