From nobody Wed Apr 06 01:22:57 2022 X-Original-To: dev-commits-ports-all@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 2286B1A8FE69; Wed, 6 Apr 2022 01:22:58 +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 4KY6Fs6m6gz3vSh; Wed, 6 Apr 2022 01:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649208178; 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=yPB76bEdnRDn+OOMlkWWH9yh7bfXHcPzV2DOrHo9fwI=; b=Sta/FY5owXgl/xR0D3OWO6mlZT/1ZIypavaD+55M6e9mEKm3BCKpfDkXmDVGsG3TnRQeLZ Ngwh4p9xUzVbcYFR+ovmHs56B48sv+SVqj848wpuGsT0nsV42cD3sBOJ0oavknWR3q/FkI C5rNl5Xzd2zr7PI1j23ooUDOemGlI3ql+HzcGHU7xE2xpI4v5t6bV6bYzslyp0AAWK4Bbq 6qBQ6tx4bLwChER6SRDJX5T9xdiCU64DDFk3Feb5WSmjDB0dZOW0lrZnEQsDXObIQAaUD+ 6bwnTX9CcvavHDwUUf9QdIzPsxr7mahYpjR9DDvQZn0uXFGt3jyRv6A0CM5D/A== 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 C06FA11D21; Wed, 6 Apr 2022 01:22:57 +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 2361MvJw098023; Wed, 6 Apr 2022 01:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2361Mv70098022; Wed, 6 Apr 2022 01:22:57 GMT (envelope-from git) Date: Wed, 6 Apr 2022 01:22:57 GMT Message-Id: <202204060122.2361Mv70098022@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 91ab6ec3dce1 - main - databases/redis*: Update CONFLICTS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91ab6ec3dce13d813ee82cc93de993b0e7baa38d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649208178; 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=yPB76bEdnRDn+OOMlkWWH9yh7bfXHcPzV2DOrHo9fwI=; b=LDZiBzVt0Fr4jNUci+4yDZ7zeMpr1fvtkL2J1rUO2v5O4o8E0Z2Vp7uB0LSPZ7w0bo3/p+ 04UFZGyRWJEPd4QJg0wl3SH58yg69Ufe9p1e1oXpGmaVmzVUJyLAPXU8Zl8CJtwNldbv8r O5OLaK6n84X+IUEuVgKqdVClOUOlZ91MWBzLCx/fmEPa13xOle2pT/450gZLeunt7b8hVS MsbjASVeESFYCumhItIRM/j4NyVOnRMfr72tUJ55tG/S/z62fLtxkf2yNax57VeNm1HAAS 2K969CYb6SVcMdZVHw6ndV+3+yZtxat+MgBadx/ZXQ0zgY1tWHtdxzzeuJJYtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649208178; a=rsa-sha256; cv=none; b=q6Hqp7InOVx0CyOK9QeSyNS+uzp+Zru7mQoSkGuyne47Y2eIqYFindhIiL1xUTJIhj1Q/X qjBlZ1o2Z43ADPj2Ku9T5OABbM2tLX3HiLFiX9911DOK0V+NSAFG0jFBEa24tbXV3q0TBg 736i2fAbDPZu+4sCmt/Zxb1pq0A26TsPwwQeS9hVSXtHuHpX9mBR2K6RYwh/juFIrZMbEN QfTai8Zp3UQp3mOosGCN6gPM70iUb1itD4Gq4trprVEKXBVehrehZCSnGgmz1FpxxYeGLZ 5kqzGGMco2dKstEhu9x0SnWv9ifEUDJA0FS8Bz+GvWSm/mrxNqc25Yo/L3TbKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=91ab6ec3dce13d813ee82cc93de993b0e7baa38d commit 91ab6ec3dce13d813ee82cc93de993b0e7baa38d Author: Yasuhiro Kimura AuthorDate: 2022-04-06 01:04:19 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-06 01:21:08 +0000 databases/redis*: Update CONFLICTS databases/redis5 is removed from ports tree. --- databases/redis-devel/Makefile | 2 +- databases/redis/Makefile | 2 +- databases/redis6/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 44e5f12fecb3..69c44dfb31de 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -68,7 +68,7 @@ LDFLAGS+= -Wl,-E LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-6.* redis5-5.* redis6-6.* +CONFLICTS?= redis-6.* redis6-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 46939f33b844..31855c4059c8 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -70,7 +70,7 @@ LDFLAGS= -Wl,-E LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis5-5.* redis6-6.* redis-devel-6.* +CONFLICTS?= redis6-6.* redis-devel-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index 041eaaa3e577..15b12ac4ab38 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -69,7 +69,7 @@ LDFLAGS= -Wl,-E LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis5-5.* redis-6.* redis-devel-6.* +CONFLICTS?= redis-6.* redis-devel-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \