diff --git a/databases/libhiredis/Makefile b/databases/libhiredis/Makefile index a2df2c503fc..8d8b8229595 100644 --- a/databases/libhiredis/Makefile +++ b/databases/libhiredis/Makefile @@ -2,10 +2,10 @@ COMMENT= minimalistic C client for Redis GH_ACCOUNT= redis GH_PROJECT= hiredis -GH_TAGNAME= v1.0.2 +GH_TAGNAME= v1.1.0 PKGNAME= lib${DISTNAME} -SHARED_LIBS= hiredis 1.0 +SHARED_LIBS= hiredis 1.1 CATEGORIES= databases devel diff --git a/databases/libhiredis/distinfo b/databases/libhiredis/distinfo index b6900f42f01..2cc5f6559a7 100644 --- a/databases/libhiredis/distinfo +++ b/databases/libhiredis/distinfo @@ -1,2 +1,2 @@ -SHA256 (hiredis-1.0.2.tar.gz) = 4Ktpbi8H3rQlLdpFtwPQmFTlO5cDx9Uhgs5aImFsOBk= -SIZE (hiredis-1.0.2.tar.gz) = 98139 +SHA256 (hiredis-1.1.0.tar.gz) = /m0hdB7H8/yd9AnZIfR9/HOk2P9k9KxvHZX5Ub9/U9Y= +SIZE (hiredis-1.1.0.tar.gz) = 122002 diff --git a/databases/libhiredis/patches/patch-Makefile b/databases/libhiredis/patches/patch-Makefile index 37d877cf894..e820e46a339 100644 --- a/databases/libhiredis/patches/patch-Makefile +++ b/databases/libhiredis/patches/patch-Makefile @@ -1,9 +1,9 @@ Index: Makefile --- Makefile.orig +++ Makefile -@@ -15,10 +15,10 @@ PKGCONFNAME=hiredis.pc - SSL_LIBNAME=libhiredis_ssl - SSL_PKGCONFNAME=hiredis_ssl.pc +@@ -9,10 +9,10 @@ TESTS=hiredis-test + LIBNAME=libhiredis + PKGCONFNAME=hiredis.pc -HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}') -HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}') @@ -16,12 +16,12 @@ Index: Makefile # Installation related variables and target PREFIX?=/usr/local -@@ -239,7 +239,7 @@ $(PKGCONFNAME): hiredis.h +@@ -280,7 +280,7 @@ $(PKGCONFNAME): hiredis.h @echo >> $@ @echo Name: hiredis >> $@ @echo Description: Minimalistic C client library for Redis. >> $@ - @echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@ + @echo Version: $(_HIREDIS_MAJOR).$(_HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@ @echo Libs: -L\$${libdir} -lhiredis >> $@ - @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ + @echo Cflags: -I\$${pkgincludedir} -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ diff --git a/databases/libhiredis/pkg/PLIST b/databases/libhiredis/pkg/PLIST index 7fbed5991a3..bafbb6cf0f3 100644 --- a/databases/libhiredis/pkg/PLIST +++ b/databases/libhiredis/pkg/PLIST @@ -5,14 +5,17 @@ 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/libuv.h include/hiredis/adapters/macosx.h +include/hiredis/adapters/poll.h include/hiredis/adapters/qt.h include/hiredis/alloc.h include/hiredis/async.h include/hiredis/hiredis.h include/hiredis/read.h include/hiredis/sds.h +include/hiredis/sockcompat.h @static-lib lib/libhiredis.a @lib lib/libhiredis.so.${LIBhiredis_VERSION} lib/pkgconfig/hiredis.pc