update to xapian 1.4.13

mostly from Lucas Raab, patch/wantlib regen + shared_libs bump from me
This commit is contained in:
sthen 2019-10-23 12:13:34 +00:00
parent 3351900324
commit fc6d0b9274
13 changed files with 37 additions and 48 deletions

View File

@ -1,20 +1,16 @@
# $OpenBSD: Makefile,v 1.21 2019/08/31 18:28:08 jeremy Exp $
# $OpenBSD: Makefile,v 1.22 2019/10/23 12:13:34 sthen Exp $
COMMENT-main= perl bindings for Xapian
COMMENT-python= python bindings for Xapian
COMMENT-ruby= ruby bindings for Xapian
V= 1.4.5
V= 1.4.13
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= 6
REVISION-ruby= 6
REVISION-main= 3
MODULES= lang/python \
lang/ruby

View File

@ -1,2 +1,2 @@
SHA256 (xapian-bindings-1.4.5.tar.xz) = ZHiGcwpxvMDp9mb81wK3FB1OmoLhCF5E60RwYk4anTM=
SIZE (xapian-bindings-1.4.5.tar.xz) = 1118884
SHA256 (xapian-bindings-1.4.13.tar.xz) = elpdJxIVntClF0qKq+38AUUqaevW4hR9l+SXEiuqWJI=
SIZE (xapian-bindings-1.4.13.tar.xz) = 1132592

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-perl_Makefile_in,v 1.2 2017/11/13 23:36:05 jeremy Exp $
$OpenBSD: patch-perl_Makefile_in,v 1.3 2019/10/23 12:13:34 sthen Exp $
Index: perl/Makefile.in
--- perl/Makefile.in.orig
+++ perl/Makefile.in
@@ -1480,7 +1480,7 @@ clean-local:
@@ -1482,7 +1482,7 @@ clean-local:
auto/Xapian/Xapian$(PERL_SO): Xapian.la
@$(MKDIR_P) auto/Xapian

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-python3_Makefile_in,v 1.1 2018/12/20 09:59:26 robert Exp $
$OpenBSD: patch-python3_Makefile_in,v 1.2 2019/10/23 12:13:34 sthen Exp $
Index: python3/Makefile.in
--- python3/Makefile.in.orig
+++ python3/Makefile.in
@@ -1295,7 +1295,7 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@:
@@ -1296,7 +1296,7 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@:
xapian/_xapian$(PYTHON3_SO): _xapian.la
$(MKDIR_P) xapian

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ruby,v 1.4 2019/08/31 18:28:08 jeremy Exp $
@comment $OpenBSD: PLIST-ruby,v 1.5 2019/10/23 12:13:34 sthen Exp $
@comment ${MODRUBY_SITEARCHDIR}/_xapian.a
${MODRUBY_SITEARCHDIR}/_xapian.so
${MODRUBY_SITEDIR}/xapian.rb
@ -26,6 +26,7 @@ share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker.
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Posting.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Query.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/QueryParser.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Term.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Value.html
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ValueCountMatchSpy.html

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.34 2019/07/12 20:44:03 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2019/10/23 12:13:34 sthen Exp $
COMMENT= search engine library
V= 1.4.5
V= 1.4.13
PORTROACH= limitw:1,even
DISTNAME= xapian-core-${V}
REVISION= 2
SHARED_LIBS += xapian 4.0 # .28.2
SHARED_LIBS += xapian 5.0 # 39.1
CATEGORIES= databases textproc

View File

@ -1,2 +1,2 @@
SHA256 (xapian-core-1.4.5.tar.xz) = hbX5Ut6d+SX9E+APboJIQWL9UG04dFYTpQsKIGTGsCs=
SIZE (xapian-core-1.4.5.tar.xz) = 2810612
SHA256 (xapian-core-1.4.13.tar.xz) = k/j//6gMXmA2vvvzVvNEVswYwvdFzvhem0z8JUBCE3w=
SIZE (xapian-core-1.4.13.tar.xz) = 2985532

View File

@ -1,5 +1,7 @@
$OpenBSD: patch-cmake_xapian-config_cmake_in,v 1.2 2017/12/01 14:33:40 jca Exp $
$OpenBSD: patch-cmake_xapian-config_cmake_in,v 1.3 2019/10/23 12:13:35 sthen Exp $
Allow Xapian library to be found by CMake-based ports.
Index: cmake/xapian-config.cmake.in
--- cmake/xapian-config.cmake.in.orig
+++ cmake/xapian-config.cmake.in

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-pkgconfig_xapian-core_pc_in,v 1.1 2019/06/29 13:04:36 robert Exp $
our pkg-config(1) does not like multi-line values
Index: pkgconfig/xapian-core.pc.in
--- pkgconfig/xapian-core.pc.in.orig
+++ pkgconfig/xapian-core.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
includedir=@incdir@
Name: The Xapian Probabilistic Information Retrieval Library
-Description: Xapian is an Open Source Probabilistic Information Retrieval framework. It
-offers a highly adaptable toolkit that allows developers to easily add advanced
-indexing and search facilities to applications. This package provides the
+Description: Xapian is an Open Source Probabilistic Information Retrieval framework. It \
+offers a highly adaptable toolkit that allows developers to easily add advanced \
+indexing and search facilities to applications. This package provides the \
libraries for applications using Xapian functionality.
URL: https://xapian.org/
Version: @VERSION@

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2017/11/13 23:36:05 jeremy Exp $
@comment $OpenBSD: PLIST,v 1.9 2019/10/23 12:13:35 sthen Exp $
@bin bin/copydatabase
@bin bin/quest
@bin bin/simpleexpand
@ -9,6 +9,7 @@
bin/xapian-config
@bin bin/xapian-delve
@bin bin/xapian-metadata
@bin bin/xapian-pos
@bin bin/xapian-progsrv
@bin bin/xapian-replicate
@bin bin/xapian-replicate-server
@ -66,6 +67,7 @@ lib/pkgconfig/xapian-core.pc
@man man/man1/xapian-config.1
@man man/man1/xapian-delve.1
@man man/man1/xapian-metadata.1
@man man/man1/xapian-pos.1
@man man/man1/xapian-progsrv.1
@man man/man1/xapian-replicate-server.1
@man man/man1/xapian-replicate.1
@ -107,6 +109,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
@ -122,6 +127,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseLockError__inherit__gra
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
@ -456,6 +464,7 @@ share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Remote.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Unicode.html
share/doc/xapian-core/apidoc/html/namespacemembers.html
share/doc/xapian-core/apidoc/html/namespacemembers_enum.html
share/doc/xapian-core/apidoc/html/namespacemembers_eval.html
share/doc/xapian-core/apidoc/html/namespacemembers_func.html
share/doc/xapian-core/apidoc/html/namespacemembers_type.html
share/doc/xapian-core/apidoc/html/namespacemembers_vars.html
@ -526,6 +535,7 @@ share/xapian-core/stopwords/finnish.list
share/xapian-core/stopwords/french.list
share/xapian-core/stopwords/german.list
share/xapian-core/stopwords/hungarian.list
share/xapian-core/stopwords/indonesian.list
share/xapian-core/stopwords/italian.list
share/xapian-core/stopwords/norwegian.list
share/xapian-core/stopwords/portuguese.list

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2019/07/12 20:51:07 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2019/10/23 12:13:35 sthen Exp $
COMMENT= web search application
V= 1.4.5
V= 1.4.13
PORTROACH= limitw:1,even
DISTNAME= xapian-omega-${V}
REVISION= 1
CATEGORIES= www textproc
@ -14,7 +13,7 @@ HOMEPAGE= https://xapian.org/
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += c m uuid ${COMPILER_LIBCXX} z xapian pcre magic
WANTLIB += ${COMPILER_LIBCXX} c iconv m magic pcre uuid xapian z
MASTER_SITES= https://oligarchy.co.uk/xapian/${V}/
EXTRACT_SUFX= .tar.xz

View File

@ -1,2 +1,2 @@
SHA256 (xapian-omega-1.4.5.tar.xz) = mck8qQhQna67qlwXSGh4gQNk5qYjx8WFb71AcidDUX4=
SIZE (xapian-omega-1.4.5.tar.xz) = 502820
SHA256 (xapian-omega-1.4.13.tar.xz) = wm7EqZohDCbOZOwIvH27nMp42C2SZjUdSYdR9ldeiQY=
SIZE (xapian-omega-1.4.13.tar.xz) = 540216

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-omega_conf,v 1.2 2017/11/13 23:36:05 jeremy Exp $
$OpenBSD: patch-omega_conf,v 1.3 2019/10/23 12:13:35 sthen Exp $
Index: omega.conf
--- omega.conf.orig
+++ omega.conf