Date: Sun, 14 Apr 2024 19:53:48 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f72286bcc45d - main - databases/hiredis: Update to upstream commit 7ab6b82 Message-ID: <202404141953.43EJrm3m023749@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f72286bcc45dc7ed789e71752c13c2ba61bedfe4 commit f72286bcc45dc7ed789e71752c13c2ba61bedfe4 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-04-14 19:20:31 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2024-04-14 19:52:59 +0000 databases/hiredis: Update to upstream commit 7ab6b82 * Disable tests as they require a redis-server Changelog: https://github.com/redis/hiredis/compare/v1.0.2...7ab6b82 PR: 277927 Approved by: portmgr (maintainer timeout, 2+ weeks) --- databases/hiredis/Makefile | 31 ++++++++++--------------------- databases/hiredis/distinfo | 6 +++--- databases/hiredis/files/patch-hiredis.h | 11 +++++++++++ databases/hiredis/pkg-plist | 18 ++++++++++++++---- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/databases/hiredis/Makefile b/databases/hiredis/Makefile index 87d7fc9a21a6..65a82f428108 100644 --- a/databases/hiredis/Makefile +++ b/databases/hiredis/Makefile @@ -1,6 +1,6 @@ PORTNAME= hiredis -PORTVERSION= 1.0.2 -DISTVERSIONPREFIX=v +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.0-15 CATEGORIES= databases MAINTAINER= olgeni@FreeBSD.org @@ -8,28 +8,17 @@ COMMENT= Minimalistic C client library for the Redis database WWW= https://github.com/redis/hiredis LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -USE_GITHUB= yes -GH_ACCOUNT= redis - -USES= cpe gmake -USE_LDCONFIG= yes - +USES= cmake cpe pathfix ssl CPE_VENDOR= redislabs +USE_LDCONFIG= yes -OPTIONS_DEFINE= OPENSSL -OPTIONS_DEFAULT= OPENSSL -OPENSSL_MAKE_ARGS= USE_SSL=1 - -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 +USE_GITHUB= yes +GH_ACCOUNT= redis +GH_TAGNAME= 7ab6b82 -do-test: - cd ${WRKSRC} && ${MAKE_CMD} test +CMAKE_OFF= ENABLE_NUGET +CMAKE_ON= DISABLE_TESTS ENABLE_SSL .include <bsd.port.mk> diff --git a/databases/hiredis/distinfo b/databases/hiredis/distinfo index 396712ba7db9..212f3760a2a6 100644 --- a/databases/hiredis/distinfo +++ b/databases/hiredis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651162224 -SHA256 (redis-hiredis-v1.0.2_GH0.tar.gz) = e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 -SIZE (redis-hiredis-v1.0.2_GH0.tar.gz) = 98139 +TIMESTAMP = 1711298380 +SHA256 (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = fb136fc3f5bce774eb92709e1d041fa851e1130e95cc3aea5b871b91ff0ce4c5 +SIZE (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = 128129 diff --git a/databases/hiredis/files/patch-hiredis.h b/databases/hiredis/files/patch-hiredis.h new file mode 100644 index 000000000000..414bd3c61bf4 --- /dev/null +++ b/databases/hiredis/files/patch-hiredis.h @@ -0,0 +1,11 @@ +--- hiredis.h.orig 2024-03-24 16:33:25 UTC ++++ hiredis.h +@@ -48,7 +48,7 @@ typedef long long ssize_t; + #define HIREDIS_MAJOR 1 + #define HIREDIS_MINOR 2 + #define HIREDIS_PATCH 0 +-#define HIREDIS_SONAME 1.2.1-dev ++#define HIREDIS_SONAME 1.2.1 + + /* Connection type can be blocking or non-blocking and is set in the + * least significant bit of the flags field in redisContext. */ diff --git a/databases/hiredis/pkg-plist b/databases/hiredis/pkg-plist index 03915349befa..861303e922e2 100644 --- a/databases/hiredis/pkg-plist +++ b/databases/hiredis/pkg-plist @@ -3,20 +3,30 @@ include/hiredis/adapters/glib.h include/hiredis/adapters/ivykis.h include/hiredis/adapters/libev.h include/hiredis/adapters/libevent.h +include/hiredis/adapters/libhv.h +include/hiredis/adapters/libsdevent.h include/hiredis/adapters/libuv.h include/hiredis/adapters/macosx.h +include/hiredis/adapters/poll.h include/hiredis/adapters/qt.h +include/hiredis/adapters/redismoduleapi.h include/hiredis/alloc.h include/hiredis/async.h include/hiredis/hiredis.h include/hiredis/hiredis_ssl.h include/hiredis/read.h include/hiredis/sds.h -lib/libhiredis.a +include/hiredis/sockcompat.h +lib/cmake/hiredis/hiredis-config-version.cmake +lib/cmake/hiredis/hiredis-config.cmake +lib/cmake/hiredis/hiredis-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/hiredis/hiredis-targets.cmake +lib/cmake/hiredis_ssl/hiredis_ssl-config.cmake +lib/cmake/hiredis_ssl/hiredis_ssl-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/hiredis_ssl/hiredis_ssl-targets.cmake lib/libhiredis.so -lib/libhiredis.so.1.0.0 -lib/libhiredis_ssl.a +lib/libhiredis.so.1.2.1 lib/libhiredis_ssl.so -lib/libhiredis_ssl.so.1.0.0 +lib/libhiredis_ssl.so.1.2.1 libdata/pkgconfig/hiredis.pc libdata/pkgconfig/hiredis_ssl.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404141953.43EJrm3m023749>