sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/redis{6,62}: Fix problem that pkg-message is misleading

Browse source 
When installing package of databases/redis62, following pkg-message is
displayed.

          To setup "redis62" you need to edit the configuration file:
          /usr/local/etc/redis62.conf

          To run redis from startup, add redis62_enable="YES"
          in your /etc/rc.conf.

But path of configuration file is /usr/local/etc/redis.conf and what
should really be added to /etc/rc.conf is redis_enable="YES". Same
problem also happens when installing databases/redis6

The source of the problem is that the value of ${PORTNAME} is used to
create pkg-message from file/pkg-message.in. So fix it by changing the
value of ${PORTNAME} to "redis" and set PKGNAMESUFFIX in Makefile of
each port.

While I'm here,

* Pet portlint and portclippy
* Tidy up Makefile with portfmt.

PR:		265623
Reported by:	FiLiS
MFH:		2022Q3
This commit is contained in:
Yasuhiro Kimura 2022-08-07 13:31:13 +09:00
parent 206e447a83
commit da202ea080
12 changed files with 72 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
databases/redis6/Makefile
View file

@ -1,9 +1,9 @@
PORTNAME= redis6 PORTNAME= redis
PORTVERSION= 6.0.16 PORTVERSION= 6.0.16
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= https://download.redis.io/releases/ MASTER_SITES= https://download.redis.io/releases/
DISTNAME= redis-${PORTVERSION} PKGNAMESUFFIX= 6
MAINTAINER= yasu@FreeBSD.org MAINTAINER= yasu@FreeBSD.org
COMMENT= Persistent key-value database with built-in net interface COMMENT= Persistent key-value database with built-in net interface
@ -13,60 +13,55 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES+= compiler:c11 gmake USES+= compiler:c11 gmake
MAKE_ENV= OPTIMIZATION= \
V=yo
CONFLICTS_INSTALL= redis redis-devel # etc/rc.d/redis
OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB
OPTIONS_DEFAULT= TLS OPTIONS_DEFAULT= TLS
OPTIONS_RADIO= EXTLUA OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR
OPTIONS_SUB= yes OPTIONS_SUB= yes
JEMALLOC_DESC= Use jemalloc JEMALLOC_DESC= Use jemalloc
LUA_DESC= Use lang/lua instead of builtin lua
LUAJIT_DESC= Use lang/luajit instead of builtin lua
LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua
TLS_DESC= Use TLS (openssl req.) LUAJIT_DESC= Use lang/luajit instead of builtin lua
LUA_DESC= Use lang/lua instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests TESTS_DESC= Install lang/tcl for redis unit tests
TLS_DESC= Use TLS (openssl req.)
TRIB_DESC= Install redis-trib.rb (lang/ruby req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
MAKE_ENV= V=yo OPTIMIZATION=
CONFLICTS_INSTALL= redis redis-devel # etc/rc.d/redis
JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes
LUA_USES= lua:51
LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua
LUA_VARS= _addflags=true
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit
LUAJIT_VARS= _addflags=true
LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
LUAJITOR_VARS= _addflags=true LUAJITOR_VARS= _ADDFLAGS=true
LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit
LUAJIT_VARS= _ADDFLAGS=true
LUA_USES= lua:51
LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua
LUA_VARS= _ADDFLAGS=true
TESTS_USES= tcl:build TESTS_USES= tcl:build
TLS_USES= ssl TLS_USES= ssl
TLS_MAKE_ENV= BUILD_TLS=yes TLS_MAKE_ENV= BUILD_TLS=yes
TRIB_CATEGORIES= ruby TRIB_CATEGORIES= ruby
TRIB_USE= ruby=yes
TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis
TRIB_USE= RUBY=yes
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} .if ${ARCH} == i386 && !${CFLAGS:M-march=*}
# Needed for __atomic_fetch_add_8 # Needed for __atomic_fetch_add_8
USE_GCC= yes USE_GCC= yes
CFLAGS+= -march=i586 CFLAGS+= -march=i586
.endif .endif
.if defined(_ADDFLAGS) .if defined(_ADDFLAGS)
CFLAGS= -fPIC CFLAGS+= -fPIC
LDFLAGS= -Wl,-E LDFLAGS+= -Wl,-E
.endif .endif
LDFLAGS+= -lpthread -lm -lexecinfo LDFLAGS+= -lpthread -lm -lexecinfo
@ -74,8 +69,8 @@ LDFLAGS+= -lpthread -lm -lexecinfo
CONFLICTS?= redis-[1-9].* redis-devel-* redis62-* CONFLICTS?= redis-[1-9].* redis-devel-* redis62-*
USE_RC_SUBR= redis sentinel USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \
redis-cli redis-sentinel redis-server redis-sentinel redis-server
USERS= redis USERS= redis
GROUPS= redis GROUPS= redis
@ -86,16 +81,16 @@ REDIS_LOGDIR?= /var/log/redis
SUB_FILES= pkg-message SUB_FILES= pkg-message
SUB_LIST+= PORTNAME=${PORTNAME} \ SUB_LIST+= PORTNAME=${PORTNAME} \
REDIS_USER=${USERS} \
REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_DBDIR=${REDIS_DBDIR} \
REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \
REDIS_RUNDIR=${REDIS_RUNDIR} REDIS_RUNDIR=${REDIS_RUNDIR} \
REDIS_USER=${USERS}
PLIST_SUB+= REDIS_USER=${USERS} \ PLIST_SUB+= REDIS_DBDIR=${REDIS_DBDIR} \
REDIS_GROUP=${GROUPS} \ REDIS_GROUP=${GROUPS} \
REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \
REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} \
REDIS_RUNDIR=${REDIS_RUNDIR} REDIS_USER=${USERS}
post-patch-JEMALLOC-on: post-patch-JEMALLOC-on:
@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile

4
databases/redis6/files/patch-deps-hiredis-net.c
View file

@ -1,5 +1,5 @@
--- deps/hiredis/net.c.orig 2019-11-28 14:32:05.942453000 -0500 --- deps/hiredis/net.c.orig 2019-11-28 19:32:05 UTC
+++ deps/hiredis/net.c 2019-11-28 14:39:08.326408000 -0500 +++ deps/hiredis/net.c
@@ -178,14 +178,34 @@ @@ -178,14 +178,34 @@
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
return REDIS_ERR; return REDIS_ERR;

6
databases/redis62/Makefile
View file

@ -1,9 +1,9 @@
PORTNAME= redis62 PORTNAME= redis
DISTVERSION= 6.2.7 DISTVERSION= 6.2.7
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= https://download.redis.io/releases/ MASTER_SITES= https://download.redis.io/releases/
DISTNAME= redis-${PORTVERSION} PKGNAMESUFFIX= 62
MAINTAINER= yasu@FreeBSD.org MAINTAINER= yasu@FreeBSD.org
COMMENT= Persistent key-value database with built-in net interface COMMENT= Persistent key-value database with built-in net interface

4
databases/redis62/files/extra-patch-deps_lua_src_lua__cjson.c
View file

@ -1,5 +1,5 @@
--- deps/lua/src/lua_cjson.c.orig 2019-12-08 07:56:31.419672000 -0500 --- deps/lua/src/lua_cjson.c.orig 2019-12-08 12:56:31 UTC
+++ deps/lua/src/lua_cjson.c 2019-12-08 07:56:52.389362000 -0500 +++ deps/lua/src/lua_cjson.c
@@ -1299,7 +1299,7 @@ @@ -1299,7 +1299,7 @@
* *
* luaL_setfuncs() is used to create a module table where the functions have * luaL_setfuncs() is used to create a module table where the functions have

4
databases/redis62/files/extra-patch-src-Makefile.lua
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 --- src/Makefile.orig 2021-01-12 14:21:03 UTC
+++ src/Makefile 2021-01-13 11:52:33.070529000 -0500 +++ src/Makefile
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

4
databases/redis62/files/extra-patch-src-Makefile.luajit
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 --- src/Makefile.orig 2021-01-12 14:21:03 UTC
+++ src/Makefile 2021-01-13 12:25:07.823451000 -0500 +++ src/Makefile
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

4
databases/redis62/files/extra-patch-src-Makefile.luajit-or
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 --- src/Makefile.orig 2021-01-12 14:21:03 UTC
+++ src/Makefile 2021-01-13 12:27:19.444193000 -0500 +++ src/Makefile
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

4
databases/redis62/files/patch-deps-Makefile
View file

@ -1,5 +1,5 @@
--- deps/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 --- deps/Makefile.orig 2021-01-12 14:21:03 UTC
+++ deps/Makefile 2021-01-13 11:37:45.979445000 -0500 +++ deps/Makefile
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
LUA_CFLAGS= -D__C99FEATURES__=1 LUA_CFLAGS= -D__C99FEATURES__=1
endif endif

4
databases/redis62/files/patch-deps-hiredis-Makefile
View file

@ -1,5 +1,5 @@
--- deps/hiredis/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 --- deps/hiredis/Makefile.orig 2021-01-12 14:21:03 UTC
+++ deps/hiredis/Makefile 2021-01-13 11:40:26.109827000 -0500 +++ deps/hiredis/Makefile
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')

4
databases/redis62/files/patch-deps-hiredis-net.c
View file

@ -1,5 +1,5 @@
--- deps/hiredis/net.c.orig 2019-11-28 14:32:05.942453000 -0500 --- deps/hiredis/net.c.orig 2019-11-28 19:32:05 UTC
+++ deps/hiredis/net.c 2019-11-28 14:39:08.326408000 -0500 +++ deps/hiredis/net.c
@@ -178,14 +178,34 @@ @@ -178,14 +178,34 @@
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
return REDIS_ERR; return REDIS_ERR;

4
databases/redis62/files/patch-deps_Makefile
View file

@ -1,5 +1,5 @@
--- deps/Makefile.orig 2021-01-13 11:43:05.174197000 -0500 --- deps/Makefile.orig 2021-01-13 16:43:05 UTC
+++ deps/Makefile 2021-01-13 11:44:13.744658000 -0500 +++ deps/Makefile
@@ -83,12 +83,12 @@ @@ -83,12 +83,12 @@
.PHONY: lua .PHONY: lua

4
databases/redis62/files/patch-redis.conf
View file

@ -1,5 +1,5 @@
--- redis.conf.orig 2021-01-12 09:21:03.000000000 -0500 --- redis.conf.orig 2021-01-12 14:21:03 UTC
+++ redis.conf 2021-01-13 11:46:40.445746000 -0500 +++ redis.conf
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it. # By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.