ports/databases/redis62/files/patch-deps-Makefile
Yasuhiro Kimura da202ea080 databases/redis{6,62}: Fix problem that pkg-message is misleading
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
2022-08-07 14:30:30 +09:00

20 lines
855 B
Text

--- deps/Makefile.orig 2021-01-12 14:21:03 UTC
+++ deps/Makefile
@@ -69,7 +69,7 @@
LUA_CFLAGS= -D__C99FEATURES__=1
endif
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
LUA_LDFLAGS+= $(LDFLAGS)
# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
# challenging to cross-compile lua (and redis). These defines make it easier
@@ -79,7 +79,7 @@
lua: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
.PHONY: lua