Attachment #249452 for bug #277927

View | Details | Raw Unified | Return to bug 277927
Collapse All | Expand All




PORTNAME=	hiredis
DISTVERSIONPREFIX=	v
DISTVERSION=	1.2.0-15
CATEGORIES=	databases

MAINTAINER=	olgeni@FreeBSD.org

WWW=		https://github.com/redis/hiredis

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake cpe pathfix ssl
GH_ACCOUNT=	redis

USES=		cpe gmake
USE_LDCONFIG=	yes

CPE_VENDOR=	redislabs
USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	redis
GH_TAGNAME=	7ab6b82

post-patch:
	@${REINPLACE_CMD} \
		-e 's|\$$(INSTALL_LIBRARY_PATH)/\$$(PKGCONF_PATH)|\$$(DESTDIR)\$$(PREFIX)/libdata/\$$(PKGCONF_PATH)|' \
		${WRKSRC}/Makefile

post-build:
	@${STRIP_CMD} ${WRKSRC}/libhiredis.so

CMAKE_OFF=	ENABLE_NUGET
CMAKE_ON=	DISABLE_TESTS ENABLE_SSL

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/databases/hiredis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1651162224	1	TIMESTAMP = 1711298380
2	SHA256 (redis-hiredis-v1.0.2_GH0.tar.gz) = e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819	2	SHA256 (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = fb136fc3f5bce774eb92709e1d041fa851e1130e95cc3aea5b871b91ff0ce4c5
3	SIZE (redis-hiredis-v1.0.2_GH0.tar.gz) = 98139	3	SIZE (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = 128129

Added Link Here

(-)b/databases/hiredis/files/patch-hiredis.h (+11 lines)
1	--- hiredis.h.orig 2024-03-24 16:33:25 UTC
2	+++ hiredis.h
3	@@ -48,7 +48,7 @@ typedef long long ssize_t;
4	#define HIREDIS_MAJOR 1
5	#define HIREDIS_MINOR 2
6	#define HIREDIS_PATCH 0
7	-#define HIREDIS_SONAME 1.2.1-dev
8	+#define HIREDIS_SONAME 1.2.1
9
10	/* Connection type can be blocking or non-blocking and is set in the
11	* least significant bit of the flags field in redisContext. */

Lines 3-22 include/hiredis/adapters/glib.h Link Here

(-)b/databases/hiredis/pkg-plist (-4 / +14 lines)
3	include/hiredis/adapters/ivykis.h	3	include/hiredis/adapters/ivykis.h
4	include/hiredis/adapters/libev.h	4	include/hiredis/adapters/libev.h
5	include/hiredis/adapters/libevent.h	5	include/hiredis/adapters/libevent.h
		6	include/hiredis/adapters/libhv.h
		7	include/hiredis/adapters/libsdevent.h
6	include/hiredis/adapters/libuv.h	8	include/hiredis/adapters/libuv.h
7	include/hiredis/adapters/macosx.h	9	include/hiredis/adapters/macosx.h
		10	include/hiredis/adapters/poll.h
8	include/hiredis/adapters/qt.h	11	include/hiredis/adapters/qt.h
		12	include/hiredis/adapters/redismoduleapi.h
9	include/hiredis/alloc.h	13	include/hiredis/alloc.h
10	include/hiredis/async.h	14	include/hiredis/async.h
11	include/hiredis/hiredis.h	15	include/hiredis/hiredis.h
12	include/hiredis/hiredis_ssl.h	16	include/hiredis/hiredis_ssl.h
13	include/hiredis/read.h	17	include/hiredis/read.h
14	include/hiredis/sds.h	18	include/hiredis/sds.h
15	lib/libhiredis.a	19	include/hiredis/sockcompat.h
		20	lib/cmake/hiredis/hiredis-config-version.cmake
		21	lib/cmake/hiredis/hiredis-config.cmake
		22	lib/cmake/hiredis/hiredis-targets-%%CMAKE_BUILD_TYPE%%.cmake
		23	lib/cmake/hiredis/hiredis-targets.cmake
		24	lib/cmake/hiredis_ssl/hiredis_ssl-config.cmake
		25	lib/cmake/hiredis_ssl/hiredis_ssl-targets-%%CMAKE_BUILD_TYPE%%.cmake
		26	lib/cmake/hiredis_ssl/hiredis_ssl-targets.cmake
16	lib/libhiredis.so	27	lib/libhiredis.so
17	lib/libhiredis.so.1.0.0	28	lib/libhiredis.so.1.2.1
18	lib/libhiredis_ssl.a
19	lib/libhiredis_ssl.so	29	lib/libhiredis_ssl.so
20	lib/libhiredis_ssl.so.1.0.0	30	lib/libhiredis_ssl.so.1.2.1
21	libdata/pkgconfig/hiredis.pc	31	libdata/pkgconfig/hiredis.pc
22	libdata/pkgconfig/hiredis_ssl.pc	32	libdata/pkgconfig/hiredis_ssl.pc

Return to bug 277927

Lines 1-6 Link Here

(-)b/databases/hiredis/Makefile (-21 / +10 lines)
1	PORTNAME= hiredis	1	PORTNAME= hiredis
2	PORTVERSION= 1.0.2	2	DISTVERSIONPREFIX= v
3	DISTVERSIONPREFIX=v	3	DISTVERSION= 1.2.0-15
4	CATEGORIES= databases	4	CATEGORIES= databases
5		5
6	MAINTAINER= olgeni@FreeBSD.org	6	MAINTAINER= olgeni@FreeBSD.org
Lines 8-35 COMMENT= Minimalistic C client library for the Redis database Link Here
8	WWW= https://github.com/redis/hiredis	8	WWW= https://github.com/redis/hiredis
9		9
10	LICENSE= BSD3CLAUSE	10	LICENSE= BSD3CLAUSE
		11	LICENSE_FILE= ${WRKSRC}/COPYING
11		12
12	USE_GITHUB= yes	13	USES= cmake cpe pathfix ssl
13	GH_ACCOUNT= redis
14
15	USES= cpe gmake
16	USE_LDCONFIG= yes
17
18	CPE_VENDOR= redislabs	14	CPE_VENDOR= redislabs
		15	USE_LDCONFIG= yes
19		16
20	OPTIONS_DEFINE= OPENSSL	17	USE_GITHUB= yes
21	OPTIONS_DEFAULT= OPENSSL	18	GH_ACCOUNT= redis
22	OPENSSL_MAKE_ARGS= USE_SSL=1	19	GH_TAGNAME= 7ab6b82
23
24	post-patch:
25	@${REINPLACE_CMD} \
26	-e 's\|\$$(INSTALL_LIBRARY_PATH)/\$$(PKGCONF_PATH)\|\$$(DESTDIR)\$$(PREFIX)/libdata/\$$(PKGCONF_PATH)\|' \
27	${WRKSRC}/Makefile
28
29	post-build:
30	@${STRIP_CMD} ${WRKSRC}/libhiredis.so
31		20
32	do-test:	21	CMAKE_OFF= ENABLE_NUGET
33	cd ${WRKSRC} && ${MAKE_CMD} test	22	CMAKE_ON= DISABLE_TESTS ENABLE_SSL
34		23
35	.include <bsd.port.mk>	24	.include <bsd.port.mk>