When there are diffs for multiple ports in one mail, please generate from a common parent directory (i.e /usr/ports in this case) so they can be applied without chopping the mail into pieces.

For xapian-bindings PLIST, these should be omitted:

+lib/python${MODPY_VERSION}/
+lib/ruby/

And the other adoption should go to the ruby PLIST not -main.

Have you tested any of the ports that depends on these?

devel/doxygen
mail/kopano/core
mail/mu
x11/kde-applications/khelpcenter
x11/kde4/baloo

I'm not aware of any specific reason to stick with the old versions, these ports have no maintainer so likely nobody is particularly interested and nobody ran into a problem that necessitated an update.

--
Sent from a phone, apologies for poor formatting.

On 20 September 2019 01:34:53 Lucas Raab <tuftedoce...@fastmail.fm> wrote:

Beg pardon for any mistakes, I've tried to follow the porters guide as
best I can.


Here are some diffs to bring xapian up to date with the latest. If
there are any specific reasons to keep at 1.4.5, I didn't find them in
the archives. Everything seems to be working fine, but let me know if
not. If I'm bang off course, I'd love to be corrected.


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-core/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 12 Jul 2019 20:44:03 -0000 1.34
+++ Makefile 19 Sep 2019 21:38:06 -0000
@@ -2,10 +2,9 @@

COMMENT= search engine library

-V= 1.4.5
+V= 1.4.12
PORTROACH= limitw:1,even
DISTNAME= xapian-core-${V}
-REVISION= 2

SHARED_LIBS +=  xapian 4.0 # .28.2

Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/xapian-core/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 13 Nov 2017 23:36:05 -0000 1.11
+++ distinfo 19 Sep 2019 21:38:06 -0000
@@ -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.12.tar.xz) = T4o22oMXEttB04oDn++1JRhpdhpYvii6gCmUu5MPrHw=
+SIZE (xapian-core-1.4.12.tar.xz) = 2979052
Index: patches/patch-pkgconfig_xapian-core_pc_in
===================================================================
RCS file: patches/patch-pkgconfig_xapian-core_pc_in
diff -N patches/patch-pkgconfig_xapian-core_pc_in
--- patches/patch-pkgconfig_xapian-core_pc_in 29 Jun 2019 13:04:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/xapian-core/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 13 Nov 2017 23:36:05 -0000 1.8
+++ pkg/PLIST 19 Sep 2019 21:38:06 -0000
@@ -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/classX
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/classX
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/namesp
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


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 31 Aug 2019 18:28:08 -0000 1.21
+++ Makefile 19 Sep 2019 21:38:31 -0000
@@ -4,16 +4,12 @@ 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.12
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 13 Nov 2017 23:36:05 -0000 1.2
+++ distinfo 19 Sep 2019 21:38:31 -0000
@@ -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.12.tar.xz) = dXcXTvvuK4k7U4f7C987Yw6C9VKIoApMPsn9xGPkKkk=
+SIZE (xapian-bindings-1.4.12.tar.xz) = 1132048
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 13 Nov 2017 23:36:05 -0000 1.2
+++ pkg/PLIST-main 19 Sep 2019 21:38:31 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.2 2017/11/13 23:36:05 jeremy Exp $
+lib/python${MODPY_VERSION}/
+lib/ruby/
libdata/perl5/site_perl/Xapian/
libdata/perl5/site_perl/Xapian.pm
libdata/perl5/site_perl/Xapian/AssertionError.pm
@@ -62,3 +64,4 @@ share/doc/xapian-bindings/perl/examples/
share/doc/xapian-bindings/perl/examples/simplematchdecider.pl
share/doc/xapian-bindings/perl/examples/simplesearch.pl
share/doc/xapian-bindings/perl/index.html
+share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/QueryParser.html


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/xapian-omega/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 12 Jul 2019 20:51:07 -0000 1.25
+++ Makefile 19 Sep 2019 21:42:37 -0000
@@ -2,10 +2,9 @@

COMMENT= web search application

-V= 1.4.5
+V= 1.4.12
PORTROACH= limitw:1,even
DISTNAME= xapian-omega-${V}
-REVISION= 1

CATEGORIES= www textproc

Index: distinfo
===================================================================
RCS file: /cvs/ports/www/xapian-omega/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 13 Nov 2017 23:36:05 -0000 1.9
+++ distinfo 19 Sep 2019 21:42:37 -0000
@@ -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.12.tar.xz) = Dmdn1Fcba1iuTmWwtgzOV5CfEa7CRfxVfrnROkfKGc4=
+SIZE (xapian-omega-1.4.12.tar.xz) = 539324


ok?



Reply via email to