Attachment #113062 for bug #154579

View | Details | Raw Unified | Return to bug 154579
Collapse All | Expand All

Lines 6-12 Link Here

(-)ports/databases/mysql55-client/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= mysql	8	PORTNAME= mysql
9	PORTREVISION= 2	9	PORTREVISION= 0
10	PKGNAMESUFFIX= -client	10	PKGNAMESUFFIX= -client
11		11
12	COMMENT= Multithreaded SQL database (client)	12	COMMENT= Multithreaded SQL database (client)

Lines 27-33 Link Here

(-)ports/databases/mysql55-client/pkg-plist (-1 lines)
27	include/mysql/my_global.h	27	include/mysql/my_global.h
28	include/mysql/my_list.h	28	include/mysql/my_list.h
29	include/mysql/my_net.h	29	include/mysql/my_net.h
30	include/mysql/my_no_pthread.h
31	include/mysql/my_pthread.h	30	include/mysql/my_pthread.h
32	include/mysql/my_sys.h	31	include/mysql/my_sys.h
33	include/mysql/my_xml.h	32	include/mysql/my_xml.h




--- 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

 )
 
 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")
 
 




--- 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@'




--- 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()
 

+ENDIF()
 
 IF(UNIX)
   SET(prefix ${CMAKE_INSTALL_PREFIX})
@@ -56,6 +58,7 @@
     SET(prefix ${CMAKE_INSTALL_PREFIX})
   ENDIF()
  
+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 
@@ -66,8 +69,10 @@
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
   ENDIF()

   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)
@@ -85,3 +90,4 @@
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 ENDIF()

Lines 6-13 Link Here

(-)ports/databases/mysql55-server/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 5.5.8	9	PORTVERSION= 5.5.9
10	PORTREVISION?= 3	10	PORTREVISION?= 0
11	CATEGORIES= databases ipv6	11	CATEGORIES= databases ipv6
12	MASTER_SITES= ${MASTER_SITE_MYSQL}	12	MASTER_SITES= ${MASTER_SITE_MYSQL}
13	MASTER_SITE_SUBDIR= MySQL-5.5	13	MASTER_SITE_SUBDIR= MySQL-5.5

Lines 1-2 Link Here

(-)ports/databases/mysql55-server/distinfo (-2 / +2 lines)
1	SHA256 (mysql-5.5.8.tar.gz) = e1175da267e8124507d69a259e144e59043f03e7a7cff81185f412cb1d6bcda2	1	SHA256 (mysql-5.5.9.tar.gz) = 2352ec7103aa302619242eb8f20fd3b7a12ba8abc55076ac7285b4d845cc96fd
2	SIZE (mysql-5.5.8.tar.gz) = 24258297	2	SIZE (mysql-5.5.9.tar.gz) = 23841228




--- 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}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ENDIF()
 


Return to bug 154579

Lines 1-5 Link Here

(-)ports/databases/mysql55-client/files/patch-include_CMakeLists.txt (-10 / +2 lines)
1	--- include/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100	1	--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
2	+++ include/CMakeLists.txt 2010-12-23 16:16:14.000000000 +0100	2	+++ include/CMakeLists.txt 2011-02-07 22:42:05.129894470 +0100
3	@@ -27,9 +27,6 @@	3	@@ -27,9 +27,6 @@
4	my_list.h	4	my_list.h
5	my_alloc.h	5	my_alloc.h
Lines 10-20 Link Here
10	)	10	)
11		11
12	SET(HEADERS	12	SET(HEADERS
13	@@ -59,6 +56,6 @@
14	)
15
16	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
17	-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
18	+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
19
20

Removed Link Here

(-)ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh (-15 lines)
1	--- scripts/mysql_config.sh.orig 2010-12-23 15:57:56.000000000 +0100
2	+++ scripts/mysql_config.sh 2010-12-23 15:58:49.000000000 +0100
3	@@ -92,7 +92,11 @@
4	fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
5
6	pkgincludedir='@pkgincludedir@'
7	-fix_path pkgincludedir include/mysql include
8	+if [ -f "$basedir/include/mysql/mysql.h" ]; then
9	+ pkgincludedir="$basedir/include/mysql"
10	+elif [ -f "$basedir/include/mysql.h" ]; then
11	+ pkgincludedir="$basedir/include"
12	+fi
13
14	version='@VERSION@'
15	socket='@MYSQL_UNIX_ADDR@'

Lines 1-6 Link Here

(-)ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt (-10 / +6 lines)
1	--- support-files/CMakeLists.txt.orig 2010-12-23 13:26:23.000000000 +0100	1	--- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100
2	+++ support-files/CMakeLists.txt 2010-12-23 13:29:45.000000000 +0100	2	+++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100
3	@@ -40,12 +40,14 @@	3	@@ -40,15 +40,18 @@
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
5	ENDIF()	5	ENDIF()
6		6
Lines 14-29 Link Here
14	+ENDIF()	14	+ENDIF()
15		15
16	IF(UNIX)	16	IF(UNIX)
17	# XXX: again, used elsewhere (scripts/), should be standardised in	17	SET(prefix ${CMAKE_INSTALL_PREFIX})
18	@@ -56,6 +58,7 @@
19	SET(prefix ${CMAKE_INSTALL_PREFIX})
20	ENDIF()
21
22	+IF(FALSE)	18	+IF(FALSE)
23	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure	19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure
24	config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)	20	config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
25	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	21	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
26	@@ -73,8 +76,10 @@	22	@@ -66,8 +69,10 @@
27	IF(INSTALL_SUPPORTFILESDIR)	23	IF(INSTALL_SUPPORTFILESDIR)
28	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	24	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
29	ENDIF()	25	ENDIF()
Lines 34-40 Link Here
34	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
35	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
36	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)	32	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
37	@@ -92,3 +97,4 @@	33	@@ -85,3 +90,4 @@
38	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	34	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
39	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	35	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
40	ENDIF()	36	ENDIF()

Lines 1-12 Link Here

(-)ports/databases/mysql55-server/files/patch-include_CMakeLists.txt (-6 / +4 lines)
1	--- include/CMakeLists.txt.orig 2010-12-23 16:09:41.000000000 +0100	1	--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
2	+++ include/CMakeLists.txt 2010-12-23 16:10:01.000000000 +0100	2	+++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100
3	@@ -58,7 +58,9 @@	3	@@ -57,5 +57,7 @@
4	${HEADERS_GEN_CONFIGURE}	4	${HEADERS_GEN_CONFIGURE}
5	)	5	)
6		6
7	+IF(FALSE)	7	+IF(FALSE)
8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
9	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )	9	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
10	+ENDIF()	10	+ENDIF()
11
12