[Midnightbsd-cvs] mports [15926] trunk/databases/mysql55-client: move mysql libs back into sub directory

[laffer1 at midnightbsd.org]

Revision: 15926
          http://svnweb.midnightbsd.org/mports/?rev=15926
Author:   laffer1
Date:     2014-02-27 08:43:17 -0500 (Thu, 27 Feb 2014)
Log Message:
-----------
move mysql libs back into sub directory

Modified Paths:
--------------
    trunk/databases/mysql55-client/Makefile
    trunk/databases/mysql55-client/files/patch-CMakeLists.txt
    trunk/databases/mysql55-client/pkg-plist

Added Paths:
-----------
    trunk/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp

Modified: trunk/databases/mysql55-client/Makefile
===================================================================
--- trunk/databases/mysql55-client/Makefile	2014-02-27 13:41:56 UTC (rev 15925)
+++ trunk/databases/mysql55-client/Makefile	2014-02-27 13:43:17 UTC (rev 15926)
@@ -12,14 +12,12 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	mysql55-client
+CONFLICTS_INSTALL=	mysql5.[0-46-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
 
-CONFLICTS=	mysql-client-[4].* mysql-client-5.[0-46-9].*
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DENABLE_DTRACE:BOOL=OFF
 
-CMAKE_ARGS=	-DWITHOUT_SERVER=1 -DENABLE_DTRACE:BOOL=OFF
+USE_LDCONFIG=	${PREFIX}/lib/mysql
 
-USE_LDCONFIG=	yes
-
 MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1

Modified: trunk/databases/mysql55-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2014-02-27 13:41:56 UTC (rev 15925)
+++ trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2014-02-27 13:43:17 UTC (rev 15926)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2012-12-10 07:16:24.000000000 +0100
-+++ CMakeLists.txt	2012-12-21 22:33:41.000000000 +0100
-@@ -305,31 +305,11 @@
+--- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
++++ CMakeLists.txt	2013-06-12 09:22:45.000000000 +0200
+@@ -305,32 +305,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,7 @@
 -    ADD_SUBDIRECTORY(internal)
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-uln)
+-  ADD_SUBDIRECTORY(packaging/rpm-oel)
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -37,8 +38,19 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -373,11 +353,11 @@
+@@ -365,8 +345,10 @@
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
  
+ # Create a single package with "make package"
+ # (see http://public.kitware.com/Bug/view.php?id=11452)
+@@ -374,11 +356,11 @@
+ 
  INCLUDE(CPack)
  IF(UNIX)
 -  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
@@ -50,7 +62,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -403,3 +383,4 @@
+@@ -404,3 +386,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Added: trunk/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp	                        (rev 0)
+++ trunk/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp	2014-02-27 13:43:17 UTC (rev 15926)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Modified: trunk/databases/mysql55-client/pkg-plist
===================================================================
--- trunk/databases/mysql55-client/pkg-plist	2014-02-27 13:41:56 UTC (rev 15925)
+++ trunk/databases/mysql55-client/pkg-plist	2014-02-27 13:43:17 UTC (rev 15926)
@@ -61,15 +61,15 @@
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-lib/libmysqlclient.a
-lib/libmysqlclient.so
-lib/libmysqlclient.so.18
-lib/libmysqlclient_r.a
-lib/libmysqlclient_r.so
-lib/libmysqlclient_r.so.18
-lib/libmysqlservices.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.18
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.18
+lib/mysql/libmysqlservices.a
 share/aclocal/mysql.m4
 @dirrm include/mysql/mysql/psi
 @dirrm include/mysql/mysql
- at dirrmtry include/mysql
+ at dirrm include/mysql
 @dirrmtry lib/mysql