diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2021-04-09 03:30:59 +0800 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2021-04-09 03:31:37 +0800 |
| commit | e1d32975edd728ef151815790045094bc131bbd0 (patch) | |
| tree | 4e0014eeb0831b2c1f68eabe8d3d1fd6d36c469f /databases | |
| parent | c608d56205edcf670ea8432a6dab6bbcc6f16b16 (diff) | |
| download | freebsd-ports-gnome-e1d32975edd728ef151815790045094bc131bbd0.tar.gz freebsd-ports-gnome-e1d32975edd728ef151815790045094bc131bbd0.tar.zst freebsd-ports-gnome-e1d32975edd728ef151815790045094bc131bbd0.zip | |
Update CONFLICTS after databases/redis4 removal.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/redis-devel/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis5/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index f738f60d28b6..1b79be50bfb2 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -69,7 +69,7 @@ LDFLAGS= -Wl,-E LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis4-4.* redis5-5.* redis-6.* +CONFLICTS?= redis5-5.* redis-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ diff --git a/databases/redis/Makefile b/databases/redis/Makefile index a6800b785f79..a191fc1b6138 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -68,7 +68,7 @@ LDFLAGS= -Wl,-E LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis4-4.* redis5-5.* redis-devel-6.* +CONFLICTS?= redis5-5.* redis-devel-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ diff --git a/databases/redis5/Makefile b/databases/redis5/Makefile index 962d1f061aca..7ac21aaef344 100644 --- a/databases/redis5/Makefile +++ b/databases/redis5/Makefile @@ -71,7 +71,7 @@ USES+= tcl:build LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis4-4.* 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 \ |