Lucas Raab <tuftedoce...@fastmail.fm> writes: > Hello, > > Below is a diff to update xapian to 1.4.16. In my testing, neomutt and > omega continue to work as expected. Anyone else want to give it a > whirl?
xapian-core, -bindings, and -omega build fine on amd64 -current, simple usage of mail/notmuch also works as expected. Cheers, Andrea > Changelogs: > xapian-core: https://xapian.org/docs/xapian-core-1.4.16/NEWS > omega: https://xapian.org/docs/xapian-omega-1.4.16/NEWS > xapian-bindings: https://xapian.org/docs/xapian-bindings-1.4.16/NEWS > > Lucas > > Index: databases/xapian-bindings/Makefile > =================================================================== > RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v > retrieving revision 1.24 > diff -u -p -r1.24 Makefile > --- databases/xapian-bindings/Makefile 4 Mar 2020 23:31:20 -0000 > 1.24 > +++ databases/xapian-bindings/Makefile 10 Jun 2020 18:59:29 -0000 > @@ -4,7 +4,7 @@ COMMENT-main= perl bindings for Xapian > COMMENT-python= python bindings for Xapian > COMMENT-ruby= ruby bindings for Xapian > > -V= 1.4.15 > +V= 1.4.16 > DISTNAME= xapian-bindings-${V} > > PKGNAME-main= xapian-bindings-perl-${V} > Index: databases/xapian-bindings/distinfo > =================================================================== > RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- databases/xapian-bindings/distinfo 4 Mar 2020 23:31:20 -0000 > 1.5 > +++ databases/xapian-bindings/distinfo 10 Jun 2020 18:59:29 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (xapian-bindings-1.4.15.tar.xz) = > aEQWEth5BKSQZuVwekLN4XHk1CO/itI/P2wEuKmyxAw= > -SIZE (xapian-bindings-1.4.15.tar.xz) = 1132248 > +SHA256 (xapian-bindings-1.4.16.tar.xz) = > h5HsbRXN0voGXkFAM9CxzVz2GRb9tHrl02w9/mm+Yhs= > +SIZE (xapian-bindings-1.4.16.tar.xz) = 1133900 > Index: databases/xapian-bindings/pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-main,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST-main > --- databases/xapian-bindings/pkg/PLIST-main 28 Dec 2019 18:00:11 -0000 > 1.3 > +++ databases/xapian-bindings/pkg/PLIST-main 10 Jun 2020 18:59:29 -0000 > @@ -28,7 +28,6 @@ libdata/perl5/site_perl/Xapian/MSetItera > libdata/perl5/site_perl/Xapian/MultiValueSorter.pm > libdata/perl5/site_perl/Xapian/NetworkError.pm > libdata/perl5/site_perl/Xapian/NetworkTimeoutError.pm > -libdata/perl5/site_perl/Xapian/PerlStopper.pm > libdata/perl5/site_perl/Xapian/PositionIterator.pm > libdata/perl5/site_perl/Xapian/PostingIterator.pm > libdata/perl5/site_perl/Xapian/Query.pm > Index: databases/xapian-core/Makefile > =================================================================== > RCS file: /cvs/ports/databases/xapian-core/Makefile,v > retrieving revision 1.37 > diff -u -p -r1.37 Makefile > --- databases/xapian-core/Makefile 4 Mar 2020 23:31:20 -0000 1.37 > +++ databases/xapian-core/Makefile 10 Jun 2020 18:59:29 -0000 > @@ -2,15 +2,14 @@ > > COMMENT= search engine library > > -V= 1.4.15 > -# XXX remove ac_cv_func_snprintf=snprintf with next release > +V= 1.4.16 > PORTROACH= limitw:1,even > DISTNAME= xapian-core-${V} > # the other xapian ports should be kept in-sync: > # databases/xapian-bindings > # www/xapian-omega > > -SHARED_LIBS += xapian 5.1 # 40.0 > +SHARED_LIBS += xapian 5.2 # 40.0 > > CATEGORIES= databases textproc > > @@ -33,7 +32,6 @@ CONFIGURE_STYLE= gnu > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > CXXFLAGS="${CXXFLAGS} -Wno-redundant-decls" \ > LDFLAGS="-L${LOCALBASE}/lib" > -CONFIGURE_ENV+= ac_cv_func_snprintf=snprintf > > .include <bsd.port.arch.mk> > # amd64-capable CPUs all have SSE > Index: databases/xapian-core/distinfo > =================================================================== > RCS file: /cvs/ports/databases/xapian-core/distinfo,v > retrieving revision 1.14 > diff -u -p -r1.14 distinfo > --- databases/xapian-core/distinfo 4 Mar 2020 23:31:20 -0000 1.14 > +++ databases/xapian-core/distinfo 10 Jun 2020 18:59:29 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (xapian-core-1.4.15.tar.xz) = > sWjpWRigHgFPtqbLziblNfgNpNR5G/paDgBR/Lb5UOo= > -SIZE (xapian-core-1.4.15.tar.xz) = 2988752 > +SHA256 (xapian-core-1.4.16.tar.xz) = > STfy9J/yfjmkIVDpKMi0WHewv0VlEPB4X1AVmly2v3A= > +SIZE (xapian-core-1.4.16.tar.xz) = 3041132 > Index: databases/xapian-core/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/databases/xapian-core/pkg/PLIST,v > retrieving revision 1.11 > diff -u -p -r1.11 PLIST > --- databases/xapian-core/pkg/PLIST 4 Mar 2020 23:31:20 -0000 1.11 > +++ databases/xapian-core/pkg/PLIST 10 Jun 2020 18:59:29 -0000 > @@ -359,6 +359,7 @@ share/doc/xapian-core/apidoc/html/doc.pn > share/doc/xapian-core/apidoc/html/document_8h.html > share/doc/xapian-core/apidoc/html/doxygen.css > share/doc/xapian-core/apidoc/html/doxygen.png > +share/doc/xapian-core/apidoc/html/dynsections.js > share/doc/xapian-core/apidoc/html/enquire_8h.html > share/doc/xapian-core/apidoc/html/error_8h.html > share/doc/xapian-core/apidoc/html/errorhandler_8h.html > @@ -453,8 +454,11 @@ share/doc/xapian-core/apidoc/html/inheri > share/doc/xapian-core/apidoc/html/inherit_graph_8.png > share/doc/xapian-core/apidoc/html/inherit_graph_9.png > share/doc/xapian-core/apidoc/html/inherits.html > +share/doc/xapian-core/apidoc/html/jquery.js > share/doc/xapian-core/apidoc/html/keymaker_8h.html > share/doc/xapian-core/apidoc/html/matchspy_8h.html > +share/doc/xapian-core/apidoc/html/menu.js > +share/doc/xapian-core/apidoc/html/menudata.js > share/doc/xapian-core/apidoc/html/mset_8h.html > share/doc/xapian-core/apidoc/html/namespaceXapian.html > share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Auto.html > Index: www/xapian-omega/Makefile > =================================================================== > RCS file: /cvs/ports/www/xapian-omega/Makefile,v > retrieving revision 1.28 > diff -u -p -r1.28 Makefile > --- www/xapian-omega/Makefile 4 Mar 2020 23:31:20 -0000 1.28 > +++ www/xapian-omega/Makefile 10 Jun 2020 19:00:14 -0000 > @@ -2,8 +2,7 @@ > > COMMENT= web search application > > -V= 1.4.15 > -# XXX remove ac_cv_func_snprintf=snprintf with next release > +V= 1.4.16 > PORTROACH= limitw:1,even > DISTNAME= xapian-omega-${V} > > @@ -29,7 +28,6 @@ LIB_DEPENDS= databases/xapian-core>=${V} > CONFIGURE_STYLE= gnu > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > -CONFIGURE_ENV+= ac_cv_func_snprintf=snprintf > > FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/xapian-omega \ > pkglibbindir=${PREFIX}/libexec/xapian-omega/cgi-bin > Index: www/xapian-omega/distinfo > =================================================================== > RCS file: /cvs/ports/www/xapian-omega/distinfo,v > retrieving revision 1.12 > diff -u -p -r1.12 distinfo > --- www/xapian-omega/distinfo 4 Mar 2020 23:31:20 -0000 1.12 > +++ www/xapian-omega/distinfo 10 Jun 2020 19:00:14 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (xapian-omega-1.4.15.tar.xz) = > wxErkggJpCo7Y8yqF0Jbmi9V+aBqUJHEAkVfzzR/w9I= > -SIZE (xapian-omega-1.4.15.tar.xz) = 545916 > +SHA256 (xapian-omega-1.4.16.tar.xz) = > tPvrmSLYSvQrqAwCWM0H0QP9f1bHGfFHBJqoRZhVdpQ= > +SIZE (xapian-omega-1.4.16.tar.xz) = 546360