pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases mariadb-connector-c: remove, conflicts with ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fa4423a866ec
branches: trunk
changeset: 453106:fa4423a866ec
user: nia <nia%pkgsrc.org@localhost>
date: Sun May 23 11:30:52 2021 +0000
description:
mariadb-connector-c: remove, conflicts with mariadb-client package
diffstat:
databases/Makefile | 3 +-
databases/mariadb-connector-c/DESCR | 2 -
databases/mariadb-connector-c/Makefile | 22 -----
databases/mariadb-connector-c/PLIST | 29 -------
databases/mariadb-connector-c/buildlink3.mk | 32 --------
databases/mariadb-connector-c/distinfo | 8 --
databases/mariadb-connector-c/options.mk | 40 ----------
databases/mariadb-connector-c/patches/patch-cmake_CheckTypes.cmake | 14 ---
databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt | 21 -----
9 files changed, 1 insertions(+), 170 deletions(-)
diffs (217 lines):
diff -r e20091d71b00 -r fa4423a866ec databases/Makefile
--- a/databases/Makefile Sun May 23 11:17:57 2021 +0000
+++ b/databases/Makefile Sun May 23 11:30:52 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.630 2021/05/13 15:25:20 jdolecek Exp $
+# $NetBSD: Makefile,v 1.631 2021/05/23 11:30:52 nia Exp $
COMMENT= Databases
@@ -97,7 +97,6 @@
SUBDIR+= lua-sql-sqlite3
SUBDIR+= lua-sqlite3
SUBDIR+= lua-tokyocabinet
-SUBDIR+= mariadb-connector-c
SUBDIR+= mariadb104-client
SUBDIR+= mariadb104-server
SUBDIR+= metakit-lib
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/DESCR
--- a/databases/mariadb-connector-c/DESCR Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This is LGPL MariaDB client library that can be used to connect to MySQL
-or MariaDB.
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/Makefile
--- a/databases/mariadb-connector-c/Makefile Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2021/05/13 11:46:13 nia Exp $
-
-DISTNAME= mariadb-connector-c-3.1.13-src
-PKGNAME= ${DISTNAME:S/-src//g}
-CATEGORIES= databases
-MASTER_SITES= https://archive.mariadb.org/connector-c-${PKGVERSION_NOREV}/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://mariadb.com/kb/en/mariadb-connector-c/
-COMMENT= MariaDB Connector C library
-LICENSE= gnu-lgpl-v2.1
-
-USE_CMAKE= yes
-USE_TOOLS+= pkg-config
-
-CMAKE_ARGS+= -DWITH_EXTERNAL_ZLIB=ON
-
-PKGCONFIG_OVERRIDE+= mariadb_config/libmariadb.pc.in
-
-.include "options.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/PLIST
--- a/databases/mariadb-connector-c/PLIST Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2021/05/13 11:46:13 nia Exp $
-bin/mariadb_config
-include/mariadb/errmsg.h
-include/mariadb/ma_list.h
-include/mariadb/ma_pvio.h
-include/mariadb/ma_tls.h
-include/mariadb/mariadb/ma_io.h
-include/mariadb/mariadb_com.h
-include/mariadb/mariadb_ctype.h
-include/mariadb/mariadb_dyncol.h
-include/mariadb/mariadb_rpl.h
-include/mariadb/mariadb_stmt.h
-include/mariadb/mariadb_version.h
-include/mariadb/mysql.h
-include/mariadb/mysql/client_plugin.h
-include/mariadb/mysql/plugin_auth.h
-include/mariadb/mysql/plugin_auth_common.h
-include/mariadb/mysqld_error.h
-lib/mariadb/libmariadb.so
-lib/mariadb/libmariadb.so.3
-lib/mariadb/libmariadbclient.a
-${PLIST.gss}lib/mariadb/plugin/auth_gssapi_client.so
-${PLIST.ssl}lib/mariadb/plugin/caching_sha2_password.so
-${PLIST.ssl}lib/mariadb/plugin/client_ed25519.so
-lib/mariadb/plugin/dialog.so
-lib/mariadb/plugin/mysql_clear_password.so
-${PLIST.curl}lib/mariadb/plugin/remote_io.so
-${PLIST.openssl}lib/mariadb/plugin/sha256_password.so
-lib/pkgconfig/libmariadb.pc
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/buildlink3.mk
--- a/databases/mariadb-connector-c/buildlink3.mk Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2021/05/13 11:46:13 nia Exp $
-
-BUILDLINK_TREE+= mariadb-connector-c
-
-.if !defined(MARIADB_CONNECTOR_C_BUILDLINK3_MK)
-MARIADB_CONNECTOR_C_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.mariadb-connector-c+= mariadb-connector-c>=3.0.0
-BUILDLINK_ABI_DEPENDS.mariadb-connector-c?= mariadb-connector-c>=3.0.6nb10
-BUILDLINK_PKGSRCDIR.mariadb-connector-c?= ../../databases/mariadb-connector-c
-
-pkgbase := mariadb-connector-c
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mcurl}
-. include "../../www/curl/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mkerberos}
-. include "../../mk/krb5.buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mgnutls}
-. include "../../security/gnutls/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mopenssl}
-. include "../../security/openssl/buildlink3.mk"
-.endif
-.endif # MARIADB_CONNECTOR_C_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -mariadb-connector-c
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/distinfo
--- a/databases/mariadb-connector-c/distinfo Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2021/05/13 11:46:13 nia Exp $
-
-SHA1 (mariadb-connector-c-3.1.13-src.tar.gz) = fbace9504a1ee9daa40ae203f619e858fe7156f2
-RMD160 (mariadb-connector-c-3.1.13-src.tar.gz) = 3ee07f5acb80362df23deb0951aa633398724435
-SHA512 (mariadb-connector-c-3.1.13-src.tar.gz) = a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
-Size (mariadb-connector-c-3.1.13-src.tar.gz) = 968401 bytes
-SHA1 (patch-cmake_CheckTypes.cmake) = 7b8184efcaee685d4b3db39441ed50ca08a8df6f
-SHA1 (patch-plugins_auth_CMakeLists.txt) = 9c2bc9448b2087fbdfa43fcfebb8f5451188efe2
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/options.mk
--- a/databases/mariadb-connector-c/options.mk Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2021/05/13 11:46:13 nia Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mariadb-connector-c
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl= gnutls openssl
-PKG_SUPPORTED_OPTIONS= curl kerberos
-PKG_SUGGESTED_OPTIONS= openssl
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= curl gss openssl ssl
-
-.if !empty(PKG_OPTIONS:Mgnutls)
-PLIST.ssl= yes
-CMAKE_ARGS+= -DWITH_SSL=GNUTLS
-. include "../../security/gnutls/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mopenssl)
-PLIST.openssl= yes
-PLIST.ssl= yes
-CMAKE_ARGS+= -DWITH_SSL=OPENSSL
-. include "../../security/openssl/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DWITH_SSL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-PLIST.curl= yes
-. include "../../www/curl/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON
-CMAKE_ARGS+= -DREMOTEIO_PLUGIN_TYPE=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-PLIST.gss= yes
-. include "../../mk/krb5.buildlink3.mk"
-.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON
-CMAKE_ARGS+= -DAUTH_GSSAPI_PLUGIN_TYPE=OFF
-.endif
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/patches/patch-cmake_CheckTypes.cmake
--- a/databases/mariadb-connector-c/patches/patch-cmake_CheckTypes.cmake Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-cmake_CheckTypes.cmake,v 1.1 2018/04/13 08:04:14 fhajny Exp $
-
-Using socket types needs libsocket on at least SunOS.
-
---- cmake/CheckTypes.cmake.orig 2017-01-17 09:53:54.000000000 +0000
-+++ cmake/CheckTypes.cmake
-@@ -98,6 +98,7 @@ IF(WIN32)
- ELSE(WIN32)
- FOREACH(CHECK_TYPE "socklen_t" "size_t" "int")
- IF (NOT SOCKET_SIZE_TYPE)
-+ SET(CMAKE_REQUIRED_LIBRARIES "${LIBSOCKET}")
- CHECK_C_SOURCE_COMPILES("
- #include <sys/socket.h>
- int main(int argc, char **argv)
diff -r e20091d71b00 -r fa4423a866ec databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt
--- a/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt Sun May 23 11:17:57 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-plugins_auth_CMakeLists.txt,v 1.2 2021/05/13 11:46:13 nia Exp $
-
-Don't peek into Kerberos if we don't want it.
-
---- plugins/auth/CMakeLists.txt.orig 2021-05-03 11:58:17.000000000 +0000
-+++ plugins/auth/CMakeLists.txt
-@@ -94,12 +94,12 @@ IF(CRYPTO_PLUGIN)
- ENDIF()
-
- #GSSAPI client authentication plugin
--IF(NOT WIN32)
-+IF(NOT WIN32 AND NOT AUTH_GSSAPI_PLUGIN_TYPE MATCHES "OFF")
- INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
- IF(GSSAPI_FOUND)
- SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c)
- ENDIF()
--ELSE()
-+ELIF(WIN32)
- SET(GSSAPI_LIBS secur32)
- SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/sspi_client.c ${AUTH_DIR}/sspi_errmsg.c)
- ENDIF()
Home |
Main Index |
Thread Index |
Old Index