View | Details | Raw Unified | Return to bug 206998 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-client/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
2
# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTREVISION?=	3
5
PORTREVISION?=	4
6
PKGNAMESUFFIX=	57-client
6
PKGNAMESUFFIX=	57-client
7
7
8
COMMENT=	Multithreaded SQL database (client)
8
COMMENT=	Multithreaded SQL database (client)
(-)mysql57-client/files/patch-cmake_install__layout.cmake (+74 lines)
Line 0 Link Here
1
--- cmake/install_layout.cmake.orig	2016-02-01 23:31:58 UTC
2
+++ cmake/install_layout.cmake
3
@@ -32,7 +32,11 @@
4
 #  SVR4
5
 #    Solaris package layout suitable for pkg* tools, prefix=/opt/mysql/mysql
6
 #
7
-#  FREEBSD, GLIBC, OSX, TARGZ
8
+#  FREEBSD
9
+#    Build with prefix=/usr/local, create tarball with install prefix="."
10
+#    and relative links.
11
+#
12
+#  GLIBC, OSX, TARGZ
13
 #    Build with prefix=/usr/local/mysql, create tarball with install prefix="."
14
 #    and relative links.
15
 #
16
@@ -94,6 +98,8 @@ IF(UNIX)
17
     SET(CPACK_SET_DESTDIR ON)
18
   ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
19
     SET(default_prefix "/opt/mysql/mysql")
20
+  ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
21
+    SET(default_prefix "/usr/local")
22
   ELSE()
23
     SET(default_prefix "/usr/local/mysql")
24
   ENDIF()
25
@@ -145,6 +151,9 @@ ELSEIF(INSTALL_LAYOUT MATCHES "RPM" OR
26
        INSTALL_LAYOUT MATCHES "DEB")
27
   SET(secure_file_priv_path "/var/lib/mysql-files")
28
   SET(secure_file_priv_embedded_path "NULL")
29
+ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
30
+  SET(secure_file_priv_path "/var/db/mysql_secure")
31
+  SET(secure_file_priv_embedded_path "NULL")
32
 ELSE()
33
   SET(secure_file_priv_path "${default_prefix}/mysql-files")
34
   SET(secure_file_priv_embedded_path "NULL")
35
@@ -210,26 +219,26 @@ SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR
36
 # FREEBSD layout
37
 #
38
 SET(INSTALL_BINDIR_FREEBSD           "bin")
39
-SET(INSTALL_SBINDIR_FREEBSD          "bin")
40
-SET(INSTALL_SCRIPTDIR_FREEBSD        "scripts")
41
+SET(INSTALL_SBINDIR_FREEBSD          "libexec")
42
+SET(INSTALL_SCRIPTDIR_FREEBSD        "bin")
43
 #
44
-SET(INSTALL_LIBDIR_FREEBSD           "lib")
45
-SET(INSTALL_PLUGINDIR_FREEBSD        "lib/plugin")
46
+SET(INSTALL_LIBDIR_FREEBSD           "lib/mysql")
47
+SET(INSTALL_PLUGINDIR_FREEBSD        "lib/mysql/plugin")
48
 #
49
-SET(INSTALL_INCLUDEDIR_FREEBSD       "include")
50
+SET(INSTALL_INCLUDEDIR_FREEBSD       "include/mysql")
51
 #
52
-SET(INSTALL_DOCDIR_FREEBSD           "docs")
53
-SET(INSTALL_DOCREADMEDIR_FREEBSD     ".")
54
+SET(INSTALL_DOCDIR_FREEBSD           "share/doc/mysql")
55
+SET(INSTALL_DOCREADMEDIR_FREEBSD     "share/doc/mysql")
56
 SET(INSTALL_MANDIR_FREEBSD           "man")
57
-SET(INSTALL_INFODIR_FREEBSD          "docs")
58
+SET(INSTALL_INFODIR_FREEBSD          "info")
59
 #
60
 SET(INSTALL_SHAREDIR_FREEBSD         "share")
61
-SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share")
62
-SET(INSTALL_MYSQLTESTDIR_FREEBSD     "mysql-test")
63
-SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "support-files")
64
+SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share/mysql")
65
+SET(INSTALL_MYSQLTESTDIR_FREEBSD     "share/mysql/tests")
66
+SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "share/mysql")
67
 #
68
-SET(INSTALL_MYSQLDATADIR_FREEBSD     "data")
69
-SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "keyring")
70
+SET(INSTALL_MYSQLDATADIR_FREEBSD     "/var/db/mysql")
71
+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "etc/mysql/keyring")
72
 SET(INSTALL_PLUGINTESTDIR_FREEBSD    ${plugin_tests})
73
 SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
74
 SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_FREEBSD ${secure_file_priv_embedded_path})
(-)mysql57-server/Makefile (-19 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTVERSION=	5.7.11
5
PORTVERSION=	5.7.11
6
PORTREVISION?=	4
6
PORTREVISION?=	5
7
CATEGORIES=	databases ipv6
7
CATEGORIES=	databases ipv6
8
MASTER_SITES=	MYSQL/MySQL-5.7
8
MASTER_SITES=	MYSQL/MySQL-5.7
9
PKGNAMESUFFIX?=	57-server
9
PKGNAMESUFFIX?=	57-server
Lines 34-59 Link Here
34
34
35
CMAKE_BUILD_TYPE=	Release
35
CMAKE_BUILD_TYPE=	Release
36
36
37
CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
37
CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
38
		-DINSTALL_LDCONFIGDIR=${LOCALBASE}/libdata/ldconfig \
38
		-DINSTALL_LDCONFIGDIR=${LOCALBASE}/libdata/ldconfig \
39
		-DINSTALL_PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
39
		-DINSTALL_PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
40
		-DINSTALL_DOCDIR="share/doc/mysql" \
41
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
42
		-DINSTALL_INCLUDEDIR="include/mysql" \
43
		-DINSTALL_INFODIR="info" \
44
		-DINSTALL_LIBDIR="lib/mysql" \
45
		-DINSTALL_MANDIR="man" \
46
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
47
		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
48
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
49
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
50
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
51
		-DINSTALL_SBINDIR="libexec" \
52
		-DINSTALL_SCRIPTDIR="bin" \
53
		-DINSTALL_SHAREDIR="share" \
54
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
55
		-DMYSQL_KEYRINGDIR=${PREFIX}/etc/mysql/keyring \
56
		-DSYSCONFDIR=${PREFIX}/etc/mysql \
57
		-DWITH_BOOST=${WRKSRC}/boost \
40
		-DWITH_BOOST=${WRKSRC}/boost \
58
		-DWITH_EDITLINE=system \
41
		-DWITH_EDITLINE=system \
59
		-DWITH_LIBEVENT=system \
42
		-DWITH_LIBEVENT=system \
(-)mysql57-server/files/patch-cmake_install__layout.cmake (+74 lines)
Line 0 Link Here
1
--- cmake/install_layout.cmake.orig	2016-02-01 23:31:58 UTC
2
+++ cmake/install_layout.cmake
3
@@ -32,7 +32,11 @@
4
 #  SVR4
5
 #    Solaris package layout suitable for pkg* tools, prefix=/opt/mysql/mysql
6
 #
7
-#  FREEBSD, GLIBC, OSX, TARGZ
8
+#  FREEBSD
9
+#    Build with prefix=/usr/local, create tarball with install prefix="."
10
+#    and relative links.
11
+#
12
+#  GLIBC, OSX, TARGZ
13
 #    Build with prefix=/usr/local/mysql, create tarball with install prefix="."
14
 #    and relative links.
15
 #
16
@@ -94,6 +98,8 @@ IF(UNIX)
17
     SET(CPACK_SET_DESTDIR ON)
18
   ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
19
     SET(default_prefix "/opt/mysql/mysql")
20
+  ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
21
+    SET(default_prefix "/usr/local")
22
   ELSE()
23
     SET(default_prefix "/usr/local/mysql")
24
   ENDIF()
25
@@ -145,6 +151,9 @@ ELSEIF(INSTALL_LAYOUT MATCHES "RPM" OR
26
        INSTALL_LAYOUT MATCHES "DEB")
27
   SET(secure_file_priv_path "/var/lib/mysql-files")
28
   SET(secure_file_priv_embedded_path "NULL")
29
+ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD")
30
+  SET(secure_file_priv_path "/var/db/mysql_secure")
31
+  SET(secure_file_priv_embedded_path "NULL")
32
 ELSE()
33
   SET(secure_file_priv_path "${default_prefix}/mysql-files")
34
   SET(secure_file_priv_embedded_path "NULL")
35
@@ -210,26 +219,26 @@ SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR
36
 # FREEBSD layout
37
 #
38
 SET(INSTALL_BINDIR_FREEBSD           "bin")
39
-SET(INSTALL_SBINDIR_FREEBSD          "bin")
40
-SET(INSTALL_SCRIPTDIR_FREEBSD        "scripts")
41
+SET(INSTALL_SBINDIR_FREEBSD          "libexec")
42
+SET(INSTALL_SCRIPTDIR_FREEBSD        "bin")
43
 #
44
-SET(INSTALL_LIBDIR_FREEBSD           "lib")
45
-SET(INSTALL_PLUGINDIR_FREEBSD        "lib/plugin")
46
+SET(INSTALL_LIBDIR_FREEBSD           "lib/mysql")
47
+SET(INSTALL_PLUGINDIR_FREEBSD        "lib/mysql/plugin")
48
 #
49
-SET(INSTALL_INCLUDEDIR_FREEBSD       "include")
50
+SET(INSTALL_INCLUDEDIR_FREEBSD       "include/mysql")
51
 #
52
-SET(INSTALL_DOCDIR_FREEBSD           "docs")
53
-SET(INSTALL_DOCREADMEDIR_FREEBSD     ".")
54
+SET(INSTALL_DOCDIR_FREEBSD           "share/doc/mysql")
55
+SET(INSTALL_DOCREADMEDIR_FREEBSD     "share/doc/mysql")
56
 SET(INSTALL_MANDIR_FREEBSD           "man")
57
-SET(INSTALL_INFODIR_FREEBSD          "docs")
58
+SET(INSTALL_INFODIR_FREEBSD          "info")
59
 #
60
 SET(INSTALL_SHAREDIR_FREEBSD         "share")
61
-SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share")
62
-SET(INSTALL_MYSQLTESTDIR_FREEBSD     "mysql-test")
63
-SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "support-files")
64
+SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share/mysql")
65
+SET(INSTALL_MYSQLTESTDIR_FREEBSD     "share/mysql/tests")
66
+SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "share/mysql")
67
 #
68
-SET(INSTALL_MYSQLDATADIR_FREEBSD     "data")
69
-SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "keyring")
70
+SET(INSTALL_MYSQLDATADIR_FREEBSD     "/var/db/mysql")
71
+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "etc/mysql/keyring")
72
 SET(INSTALL_PLUGINTESTDIR_FREEBSD    ${plugin_tests})
73
 SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
74
 SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_FREEBSD ${secure_file_priv_embedded_path})

Return to bug 206998