From 33ceff2db24c922990d1627142f553967ec4f796 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 21 Dec 2020 15:00:10 +0000 Subject: [PATCH] update to xapian 1.4.17, switch from libuuid to libc functions while there (both are supported but xapian prefers libuuid if found during configure). WANTLIB syncs in dependent ports to follow. --- databases/xapian-bindings/Makefile | 8 +++----- databases/xapian-bindings/distinfo | 4 ++-- databases/xapian-core/Makefile | 12 ++++++------ databases/xapian-core/distinfo | 4 ++-- www/xapian-omega/Makefile | 9 +++++---- www/xapian-omega/distinfo | 4 ++-- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile index 91cb84a3fe4..bb86a758855 100755 --- a/databases/xapian-bindings/Makefile +++ b/databases/xapian-bindings/Makefile @@ -1,18 +1,16 @@ -# $OpenBSD: Makefile,v 1.27 2020/12/10 02:20:29 daniel Exp $ +# $OpenBSD: Makefile,v 1.28 2020/12/21 15:00:10 sthen Exp $ COMMENT-main= perl bindings for Xapian COMMENT-python= python bindings for Xapian COMMENT-ruby= ruby bindings for Xapian -V= 1.4.16 +V= 1.4.17 DISTNAME= xapian-bindings-${V} PKGNAME-main= xapian-bindings-perl-${V} PKGNAME-python= xapian-bindings-python-${V} PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V} -REVISION-python = 0 - MODULES= lang/python \ lang/ruby @@ -37,7 +35,7 @@ LIB_DEPENDS= databases/xapian-core BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}>=1.5 -WANTLIB += ${COMPILER_LIBCXX} m uuid z xapian +WANTLIB += ${COMPILER_LIBCXX} m z xapian WANTLIB-main = ${WANTLIB} c perl MODRUBY_RUNDEP = No diff --git a/databases/xapian-bindings/distinfo b/databases/xapian-bindings/distinfo index 7eeb926b0f5..43f100cc963 100644 --- a/databases/xapian-bindings/distinfo +++ b/databases/xapian-bindings/distinfo @@ -1,2 +1,2 @@ -SHA256 (xapian-bindings-1.4.16.tar.xz) = h5HsbRXN0voGXkFAM9CxzVz2GRb9tHrl02w9/mm+Yhs= -SIZE (xapian-bindings-1.4.16.tar.xz) = 1133900 +SHA256 (xapian-bindings-1.4.17.tar.xz) = SKZdkeDDpKj0ocoF3DkiWRIIisosR8AEjMk7CdM469M= +SIZE (xapian-bindings-1.4.17.tar.xz) = 1135100 diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile index ccb2794e40e..49713ebeba0 100755 --- a/databases/xapian-core/Makefile +++ b/databases/xapian-core/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.38 2020/07/25 19:48:43 sthen Exp $ +# $OpenBSD: Makefile,v 1.39 2020/12/21 15:00:10 sthen Exp $ COMMENT= search engine library -V= 1.4.16 +V= 1.4.17 PORTROACH= limitw:1,even DISTNAME= xapian-core-${V} # the other xapian ports should be kept in-sync: @@ -18,7 +18,7 @@ HOMEPAGE= https://xapian.org/ # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += c m ${COMPILER_LIBCXX} z uuid +WANTLIB += c m ${COMPILER_LIBCXX} z MASTER_SITES= https://oligarchy.co.uk/xapian/${V}/ EXTRACT_SUFX= .tar.xz @@ -26,12 +26,12 @@ EXTRACT_SUFX= .tar.xz # -std=gnu++11 COMPILER= base-clang ports-gcc base-gcc -LIB_DEPENDS= sysutils/e2fsprogs>=1.42.7 - CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS} -Wno-redundant-decls" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_header_uuid_uuid_h=false +# xapian is happy with libc uuid functions, but picks up libuuid if present .include # amd64-capable CPUs all have SSE diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo index b8cf4ceb191..001b288534a 100644 --- a/databases/xapian-core/distinfo +++ b/databases/xapian-core/distinfo @@ -1,2 +1,2 @@ -SHA256 (xapian-core-1.4.16.tar.xz) = STfy9J/yfjmkIVDpKMi0WHewv0VlEPB4X1AVmly2v3A= -SIZE (xapian-core-1.4.16.tar.xz) = 3041132 +SHA256 (xapian-core-1.4.17.tar.xz) = teuFVt6hsMrUFnpmIjUi5m1nDsHroWx/3IRO1rZSVy4= +SIZE (xapian-core-1.4.17.tar.xz) = 2997700 diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile index 96afb880019..ab71c7eb046 100644 --- a/www/xapian-omega/Makefile +++ b/www/xapian-omega/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.29 2020/07/25 19:48:43 sthen Exp $ +# $OpenBSD: Makefile,v 1.30 2020/12/21 15:00:10 sthen Exp $ COMMENT= web search application -V= 1.4.16 +V= 1.4.17 PORTROACH= limitw:1,even DISTNAME= xapian-omega-${V} @@ -13,7 +13,7 @@ HOMEPAGE= https://xapian.org/ # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} c iconv m magic pcre uuid xapian z +WANTLIB += ${COMPILER_LIBCXX} c iconv m magic pcre xapian z MASTER_SITES= https://oligarchy.co.uk/xapian/${V}/ EXTRACT_SUFX= .tar.xz @@ -21,7 +21,8 @@ EXTRACT_SUFX= .tar.xz # C++11 COMPILER= base-clang ports-gcc base-gcc -LIB_DEPENDS= databases/xapian-core>=${V} \ +LIB_DEPENDS= converters/libiconv \ + databases/xapian-core>=${V} \ devel/pcre \ devel/libmagic diff --git a/www/xapian-omega/distinfo b/www/xapian-omega/distinfo index 2e38935afba..3de49cf01a8 100644 --- a/www/xapian-omega/distinfo +++ b/www/xapian-omega/distinfo @@ -1,2 +1,2 @@ -SHA256 (xapian-omega-1.4.16.tar.xz) = tPvrmSLYSvQrqAwCWM0H0QP9f1bHGfFHBJqoRZhVdpQ= -SIZE (xapian-omega-1.4.16.tar.xz) = 546360 +SHA256 (xapian-omega-1.4.17.tar.xz) = 1S7qTNG78zToSvbUHqNCRGardePa3Upzbk6wyXY5LRY= +SIZE (xapian-omega-1.4.17.tar.xz) = 547372