diff --git a/databases/webdis/Makefile b/databases/webdis/Makefile index 0472cc21a694..da95f9e9746c 100644 --- a/databases/webdis/Makefile +++ b/databases/webdis/Makefile @@ -1,33 +1,33 @@ PORTNAME= webdis -DISTVERSION= 0.1.15 +DISTVERSION= 0.1.17 CATEGORIES= databases MAINTAINER= olgeni@FreeBSD.org COMMENT= HTTP interface for Redis LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:devel/libevent USES= gmake USE_GITHUB= yes GH_ACCOUNT= nicolasff USE_RC_SUBR= webdis USERS= webdis GROUPS= webdis PLIST_FILES= bin/webdis \ "@sample etc/webdis.conf.sample" post-patch: ${REINPLACE_CMD} -e "s@%%LOCALBASE%%@${LOCALBASE}@g" ${WRKSRC}/Makefile do-install: ${INSTALL} ${WRKSRC}/webdis ${STAGEDIR}${PREFIX}/bin/webdis ${INSTALL_DATA} ${FILESDIR}/webdis.conf ${STAGEDIR}${PREFIX}/etc/webdis.conf.sample post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/webdis .include diff --git a/databases/webdis/distinfo b/databases/webdis/distinfo index 5c8f572d3fec..a0a5bbbfb640 100644 --- a/databases/webdis/distinfo +++ b/databases/webdis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619428514 -SHA256 (nicolasff-webdis-0.1.15_GH0.tar.gz) = 6ef2ce437240b792442594968f149b5ddc6b4a8a0abd58f7b19374387373aed1 -SIZE (nicolasff-webdis-0.1.15_GH0.tar.gz) = 145898 +TIMESTAMP = 1630864696 +SHA256 (nicolasff-webdis-0.1.17_GH0.tar.gz) = c5e97b17f03e2759e6351581c72e582e28ea8d97210fe178c5851020540962f6 +SIZE (nicolasff-webdis-0.1.17_GH0.tar.gz) = 159091 diff --git a/databases/webdis/files/patch-Makefile b/databases/webdis/files/patch-Makefile index 0d91188e1f55..4227cf8d5745 100644 --- a/databases/webdis/files/patch-Makefile +++ b/databases/webdis/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile.orig 2019-09-30 09:33:34 UTC +--- Makefile.orig 2021-09-05 02:05:39 UTC +++ Makefile -@@ -5,8 +5,8 @@ B64_OBJS?=b64/cencode.o - FORMAT_OBJS?=formats/json.o formats/raw.o formats/common.o formats/custom-type.o - HTTP_PARSER_OBJS?=http-parser/http_parser.o +@@ -5,8 +5,8 @@ B64_OBJS?=src/b64/cencode.o + FORMAT_OBJS?=src/formats/json.o src/formats/raw.o src/formats/common.o src/formats/custom-type.o + HTTP_PARSER_OBJS?=src/http-parser/http_parser.o --CFLAGS ?= -O3 -Wall -Wextra -Isrc -Isrc/jansson/src -Isrc/http-parser -MD +-CFLAGS ?= -Wall -Wextra -Isrc -Isrc/jansson/src -Isrc/http-parser -MD -LDFLAGS ?= -levent -pthread +CFLAGS += -Isrc -Isrc/jansson/src -Isrc/http-parser -MD -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/event2 +LDFLAGS += -levent -pthread -L%%LOCALBASE%%/lib - - # check for MessagePack - MSGPACK_LIB=$(shell ls /usr/lib/libmsgpack.so 2>/dev/null) + + # Pass preprocessor macros to the compile invocation + CFLAGS += $(CPPFLAGS)