Date: Thu, 17 Aug 2023 03:36:52 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 665908692453 - main - databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS Message-ID: <202308170336.37H3aqwY045646@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6659086924531271f17a33c584c3a47d68e8642c commit 6659086924531271f17a33c584c3a47d68e8642c Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2023-03-23 08:28:07 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2023-08-17 03:29:07 +0000 databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS * Update CONFLICTS_INSTALL after databases/redis70 is added to ports tree. * Remove CONFLICTS as build of one redis version succeeds even if another version is installed. --- databases/redis-devel/Makefile | 4 +--- databases/redis/Makefile | 4 +--- databases/redis6/Makefile | 4 +--- databases/redis62/Makefile | 2 +- databases/redis70/Makefile | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 97715e870680..f264b7675b53 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -18,7 +18,7 @@ GH_TAGNAME= 6abb3c403 MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis PORTSCOUT= ignore:1 @@ -75,8 +75,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-[1-9].* redis6-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 5fa8434b338b..47fbccde0d11 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -16,7 +16,7 @@ CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis-devel redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA @@ -71,8 +71,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-devel-* redis6-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index 57f5664323df..9b636c433bb8 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -16,7 +16,7 @@ USES+= compiler:c11 gmake MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.0 @@ -69,8 +69,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-[1-9].* redis-devel-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index b78ca9c93ae6..a8800e25640e 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -18,7 +18,7 @@ CPE_PRODUCT= redis MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis6 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis6 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.2 diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile index 9434679082e3..65a94c8980d5 100644 --- a/databases/redis70/Makefile +++ b/databases/redis70/Makefile @@ -74,8 +74,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-devel-* redis6-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308170336.37H3aqwY045646>