From nobody Fri Jun 30 05:22:40 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QskGm3lkCz4krMK; Fri, 30 Jun 2023 05:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QskGm2ty5z43NF; Fri, 30 Jun 2023 05:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688102560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6er9Js8MHyFCX9Jbju18wDdS/8zn/+UMAEpqNvBFhc=; b=CGT9F7++TwT3Oba0iuH+PBciSfnIwOg4YbzsPl1pJvD52Yql6PVwRggm2xMXOK7wEKQEI8 K+olh2DqT9kZcY8Ugq2sJ5/7MZPDcE9QUsHFMDniQK7fMe9keiCB/Skp0Z+dErbdNSIbHM HXbO5Ne5GBXOYPaKhXZHtIk+a16GjOL4oXnux3uYC/VEQyQuVPdON9xrD4bSEqkfkUfqrw 2i99jyMz33qEye60f0uG+OXn9ZvX9JObc7aqdBT3zQ3rMUTRe9Y8O7EK1d9e1MyQMyNOMg 2YTTxN/eQBP4MZfWpTnhT/vvtlkzUU6lv/IgeEC9WUbnkiJ3A4Gfunqa+kpv9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688102560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6er9Js8MHyFCX9Jbju18wDdS/8zn/+UMAEpqNvBFhc=; b=qQCc+8UMLSK8RVceb2q2lIZ6tQ9GJCRFPcJTdSW5WbYFQZgc8GO73z/IbRukVCAvKWfMNS hneIfEtsmkybWykIY249Bvcn+yGNtMLe11NrKa/+A/J6bEAD4CYvKYgeVEZA7/tibASrwP kP2w4BZmIPt5cdStCHRu1bypxnXYVkvd87YC/oXgyecTxwKySgW+StvHytsQL7wxbd7T2A 7az3oaBeW58Plgz98Bwz6WwvWyvHZTOOeKGGp9TdLPHG3MQ19Cg+/hQbrIW4HRgcjoTQ53 og5zyvAUOx1YqfMMTQ42Y3AEdhZYqt71FmVSyStGlcj4Ey5Jp3leffMiJGQv0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688102560; a=rsa-sha256; cv=none; b=JN833iR1o93fFqB41TnKh8gBYKZF1i6CZvnvQrV0NpY5QBiXBSDmPIuVgBccmq/og+8tgJ 4scTcVR1tdAtgr7V/MLguBtiSltxHXTL5zcZT5sUy6D6UqV6sWQ7arM3qtDhRddIivn2ok 5tcT7b57dx7Uyv1yJdAKU5oxzwtfs1ZZiDVN4rYUMuxd+2iQxaK+g8yn2eQDCQJtxQPm/H EN2SWtzbXy5I5swLDMv/UOqPDrScGufLHoNKvl9bIUxoU0Wf7mbn0vEFSPYSuEirBPBVCJ Apx7fuQPmM2KElgakMc2lZaKdgORUfdzZcuAAD3Eh5QeHKyuJoJn/D8PViAcFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QskGm1xpFzmY9; Fri, 30 Jun 2023 05:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U5MeIW078350; Fri, 30 Jun 2023 05:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U5MeMT078349; Fri, 30 Jun 2023 05:22:40 GMT (envelope-from git) Date: Fri, 30 Jun 2023 05:22:40 GMT Message-Id: <202306300522.35U5MeMT078349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 2bcd791dc7c6 - main - */*: Cleanup pointers to EOL mariadb103 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bcd791dc7c6338329aa9186e813b52781fe68fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bcd791dc7c6338329aa9186e813b52781fe68fe commit 2bcd791dc7c6338329aa9186e813b52781fe68fe Author: Muhammad Moinur Rahman AuthorDate: 2023-06-30 05:19:03 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-30 05:19:03 +0000 */*: Cleanup pointers to EOL mariadb103 Although mariadb103 is EOL there were some pointers to this version, so cleanup the necessaries. Approved by: portmgr (blanket) --- Mk/Uses/mysql.mk | 4 ++-- Mk/bsd.default-versions.mk | 2 +- databases/ateam_mysql57_ldap_auth/Makefile | 2 +- databases/mroonga/Makefile | 2 +- databases/mysql-connector-odbc-80/Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 58dd085288ef..7605397f8003 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -67,7 +67,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 -. for v in 3 4 5 6 11 +. for v in 4 5 6 11 MYSQL10${v}m_LIBVER= 3 . endfor @@ -129,7 +129,7 @@ _MYSQL_SHLIB= libmysqlclient . if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb -. if ${MYSQL_VER:C/m//} >= 103 +. if ${MYSQL_VER:C/m//} >= 104 _MYSQL_SHLIB= libmariadb . endif . elif (${MYSQL_VER:C/[0-9]*//} == "p") diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index a0c30b3c1fbd..4da7724fbdf1 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -93,7 +93,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.10 -# Possible values: 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w +# Possible values: 5.7, 8.0, 10.4m, 10.5m, 5.7p, 5.7w MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile index cbb898070007..97c739df0ed3 100644 --- a/databases/ateam_mysql57_ldap_auth/Makefile +++ b/databases/ateam_mysql57_ldap_auth/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -IGNORE_WITH_MYSQL= 80 103m +IGNORE_WITH_MYSQL= 80 LIB_DEPENDS= libconfig.so:devel/libconfig diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile index 692a5b572231..548e8e57c3b9 100644 --- a/databases/mroonga/Makefile +++ b/databases/mroonga/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:configure LIB_DEPENDS= libgroonga.so:textproc/groonga USES= compiler:c11 libtool mysql pkgconfig shebangfix -IGNORE_WITH_MYSQL= 103m 57p 57w +IGNORE_WITH_MYSQL= 57p 57w SHEBANG_FILES= data/rpm/post.sh data/rpm/preun.sh diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile index 41b5da967b80..59346d1f33fc 100644 --- a/databases/mysql-connector-odbc-80/Makefile +++ b/databases/mysql-connector-odbc-80/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \ libzstd.so:archivers/zstd USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl -IGNORE_WITH_MYSQL= 57 103m 57p 57w +IGNORE_WITH_MYSQL= 57 57p 57w USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1