From nobody Mon Mar 7 19:14:26 2022 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 7C47819F0522; Mon, 7 Mar 2022 19:14:27 +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 4KC7S31SmYz4sql; Mon, 7 Mar 2022 19:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646680467; 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=6sP8e1X8oquKAHlxugKDQK884ZhFDcgvuEe3o1TV98Q=; b=InPudxCXBbtzFC2/2UkXhfXT3C16iuEdKOD6Gly3zr/N4imDtuzv3xq/9e6qSVFpNmFpLg t+3rHemXYLVW5kXckXnNatz+cZpnWBQOtP8q9F0/I2d9DcPjUnBg7vStEYp8u+UM33QB9+ YD1N8M5nnrJ2gy0zD70cOUKduR9v8NbqZXE7Ntb04cMGUVheP3eX/zfhSynqTNSSdxMx/Y grD0SMrfn8IGXH8VcqI/RZ8NYiRu0POFsk5i2ISm/mrCGxKGl5UakYPCWI72YE3libkt0U Oh0ANlIvmlBl97Rc00cwBp6rGBc0955rWFl2w+VL3v8AY6DKKhszKKqJZBDvwQ== 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 EE78E62A9; Mon, 7 Mar 2022 19:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227JEQ0l057418; Mon, 7 Mar 2022 19:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227JEQpO057417; Mon, 7 Mar 2022 19:14:26 GMT (envelope-from git) Date: Mon, 7 Mar 2022 19:14:26 GMT Message-Id: <202203071914.227JEQpO057417@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 823a87f4bb14 - main - databases/mariadb106-server: Fix conflicts 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 823a87f4bb14b5bb454e175e250414742988378f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646680467; 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=6sP8e1X8oquKAHlxugKDQK884ZhFDcgvuEe3o1TV98Q=; b=NMg/dKvNQorC2gTmb/CNbb1MMxxsj8Ggm4APPXDry+qyND/cxPh74jTQsDrE0P9Dax1gcv oF5ZjezoEoqEfbdL8wWOtIt7/AdYIkTfJ5ZCgCwRVal/modVnGVV+HmnpGsvQD5FLOfYTQ 8RNuhD0LTTtVk/QjqSZEZAZ+oCMI8mpazQ9IM917BY7N6vwgOLRX40LLZYyMB+yG+NuXky Qi+rxyTJlHbkbiyctfsMzqOe2EyDpV6DHV9OtSrAi0szO3lHlFVK638nfYh4SeArsHin5o 1Q4iZ7fxV9dyyxusXEs3lr+Ncnydz2cuW4H+MqAVrf02mPDJhqa0WbUhb+ZWig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646680467; a=rsa-sha256; cv=none; b=TjYkD1V2qJ0dePph5wxrJJMHhBv4Py9rSMh09/ef+MvgOXb2YDfStm8D+ToeRf/Ml4SRjy oPaHgADzu97x1bup04txyu5xpMlmv92/aZrd5cuB6/Olie0RA4wSTHZvjnG9ULArajz0zR iMBC6ykz8mgr0a+IzVchEqjT5UwWvzbjGN7NO8AoMehpZZij3bv/R7P959CN8hWP4UiHvi PZdShkMGohmciN1PKoB8d0TJIOYZEyHYZgWljYDkEX2pN+wg2DB8zSHV4d5iXcQc+45/vy VcJ7xAZGgeGcwGu4qRgvgTlMSmTflANafXda9y82gdX4RGdw0W+nI5p+76F7Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=823a87f4bb14b5bb454e175e250414742988378f commit 823a87f4bb14b5bb454e175e250414742988378f Author: Bernard Spil AuthorDate: 2022-03-07 19:13:17 +0000 Commit: Bernard Spil CommitDate: 2022-03-07 19:13:17 +0000 databases/mariadb106-server: Fix conflicts * and LOCALBASE Reported by: VVD --- databases/mariadb106-server/Makefile | 2 +- databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index f2b465bcfbfe..5adaf88e4655 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -115,7 +115,7 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql -CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ +CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh index 334353a99b4c..f8321be63ecc 100644 --- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh +++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh @@ -4,7 +4,7 @@ # Create options libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L/usr/local/lib " ++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib " include="-I$pkgincludedir" if [ "$basedir" != "/usr" ]; then