8 files changed, 91 insertions, 45 deletions

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index ccc596133774..3e60b24604df 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -2,10 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
+PORTREVISION?=	0
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
 
+LICENSE+=	LGPL21
+
+BROKEN_powerpc64=	Does not build
+BROKEN_sparc64=	Does not build: reports unsupported compiler
+
 MASTERDIR=	${.CURDIR}/../mysql56-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
@@ -13,12 +19,13 @@ PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
-			mariadb*-client-* \
-			percona*-client-*
+			mysql[0-46-9][0-9]-client-* \
+			mariadb[0-9][0-9]-client-* \
+			percona[0-9][0-9]-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
-USE_LDCONFIG=	${PREFIX}/lib/mysql
+USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
diff --git a/databases/mysql56-client/files/patch-CMakeLists.txt b/databases/mysql56-client/files/patch-CMakeLists.txt
index f7afeefc5354..3a2856f26e6d 100644
--- a/databases/mysql56-client/files/patch-CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-03-03 16:35:33.000000000 +0100
-+++ CMakeLists.txt	2016-04-19 17:30:13.343558770 +0200
-@@ -475,8 +475,8 @@ ENDIF()
+--- CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
++++ CMakeLists.txt
+@@ -481,8 +481,8 @@ ENDIF()
  
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
@@ -10,7 +10,7 @@
  
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
-@@ -546,18 +546,17 @@ ELSE()
+@@ -552,18 +552,17 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -30,7 +30,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql56-client/files/patch-extra_CMakeLists.txt b/databases/mysql56-client/files/patch-extra_CMakeLists.txt
index a2aaf7d0c496..cdfc77b55aaa 100644
--- a/databases/mysql56-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-extra_CMakeLists.txt
@@ -1,6 +1,14 @@
---- extra/CMakeLists.txt.orig	2016-03-03 16:35:33.000000000 +0100
-+++ extra/CMakeLists.txt	2016-04-19 17:37:34.634528313 +0200
-@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
+--- extra/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
++++ extra/CMakeLists.txt
+@@ -35,6 +35,7 @@ ENDIF()
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
+                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
++                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
+                    COMMAND comp_err
+                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
+                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
+@@ -60,6 +61,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
  ENDIF()
  
  
@@ -8,7 +16,7 @@
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
  SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -96,10 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
    MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
    TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
  ENDIF()
diff --git a/databases/mysql56-client/files/patch-man_CMakeLists.txt b/databases/mysql56-client/files/patch-man_CMakeLists.txt
index 0f79f3e2403d..066b1e4252b0 100644
--- a/databases/mysql56-client/files/patch-man_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-man_CMakeLists.txt
@@ -1,13 +1,15 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
+--- man/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
++++ man/CMakeLists.txt
+@@ -14,11 +14,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
  # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_FILES *.1)
 -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
 -FILE(GLOB MAN8_FILES *.8)
 -FILE(GLOB MAN8_NDB ndb*.8)
++FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1  mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1  mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
  IF(MAN1_FILES)
    IF(MAN1_EXCLUDE)
      LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
index f6f38decb8ec..fa06468ce959 100644
--- a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
+++ b/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
+--- mysys_ssl/my_default.cc.orig	2016-11-28 13:36:22 UTC
++++ mysys_ssl/my_default.cc
+@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
  
  /* Which directories are searched for options (and in which order) */
  
@@ -9,18 +9,48 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -1395,7 +1395,10 @@
+@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
+       return 1;                                 /* Ignore wrong files */
+   }
  
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
++  if (strstr(name, "/etc") == name)
 +  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++    fprintf(stderr,
++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++             name,name);
++      goto err;
 +  }
- #endif /* DEFAULT_SYSCONFDIR */
++
+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
+   {
+     line++;
+@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
+             end[(strlen(end)-1)] = ' ';
+           else
+             strxmov(end, conf_file, *ext , " ",  NullS);
+-          fputs(name, stdout);
++          if (strstr(name, "/etc") != name)
++            fputs(name, stdout);
+         }
+       }
+     }
+@@ -1400,13 +1409,8 @@ static const char **init_default_directo
+ 
+ #else
+ 
+-  errors += add_directory(alloc, "/etc/", dirs);
+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+-#if defined(DEFAULT_SYSCONFDIR)
+-  if (DEFAULT_SYSCONFDIR[0])
+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
  
  #endif
-@@ -1466,7 +1469,7 @@
+ 
+@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))
diff --git a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
index 0235dc2f305f..9d16479b0067 100644
--- a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt	2013-02-13 14:14:11.000000000 +0100
-@@ -71,6 +71,7 @@
+--- scripts/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
++++ scripts/CMakeLists.txt
+@@ -71,6 +71,7 @@ IF(UNIX)
  )
  ENDIF()
  
@@ -8,7 +8,7 @@
  INSTALL(FILES 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
+@@ -80,6 +81,7 @@ INSTALL(FILES 
    ${FIX_PRIVILEGES_SQL}
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -139,6 +141,7 @@
+@@ -168,6 +170,7 @@ ENDIF()
  SET(HOSTNAME "hostname")
  SET(MYSQLD_USER "mysql")
  
@@ -24,7 +24,7 @@
  # Required for mysqlbug until autotools are deprecated, once done remove these
  # and expand default cmake variables
  SET(CC ${CMAKE_C_COMPILER})
-@@ -175,6 +178,7 @@
+@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -199,6 +203,7 @@
+@@ -228,6 +232,7 @@ ELSE()
    SET(localstatedir ${MYSQL_DATADIR})
  ENDIF()
  
@@ -40,15 +40,15 @@
  IF(UNIX)
    SET(EXT)
  ELSE()
-@@ -213,6 +218,7 @@
+@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
    DESTINATION ${DEST}
    COMPONENT Server
    )
 +ENDIF()
  
- 
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -264,6 +270,8 @@
+ SET(sysconfdir ${prefix})
+@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " ) 
@@ -57,7 +57,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -316,17 +324,9 @@
+@@ -353,17 +361,9 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
@@ -75,7 +75,7 @@
    )
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -350,6 +350,7 @@
+@@ -387,6 +387,7 @@ ELSE()
       )
    ENDFOREACH()
  
@@ -83,7 +83,7 @@
    # Input files with pl.in extension - drop the extension completely
    SET(PLIN_FILES mysql_secure_installation)
    FOREACH(file ${PLIN_FILES})
-@@ -362,6 +363,7 @@
+@@ -399,6 +400,7 @@ ELSE()
      INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
    ENDFOREACH()
  ENDIF()
diff --git a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt b/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
index 33803dc525b9..63687d81f061 100644
--- a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ support-files/CMakeLists.txt	2013-02-13 11:13:32.000000000 +0100
-@@ -44,14 +44,17 @@
+--- support-files/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
++++ support-files/CMakeLists.txt
+@@ -44,14 +44,17 @@ ELSE()
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
  
@@ -18,7 +18,7 @@
    FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,8 +71,10 @@
+@@ -68,8 +71,10 @@ IF(UNIX)
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
@@ -29,7 +29,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)
    
-@@ -94,3 +99,4 @@
+@@ -94,3 +99,4 @@ IF(UNIX)
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()
diff --git a/databases/mysql56-client/pkg-message b/databases/mysql56-client/pkg-message
index 4aaa841dd603..879bb341f0b6 100644
--- a/databases/mysql56-client/pkg-message
+++ b/databases/mysql56-client/pkg-message
@@ -12,4 +12,3 @@ receiving a patch. Please take note of this when
 deploying this software.
 
 * * * * * * * * * * * * * * * * * * * * * * * *
-