Hello,

Attached is an update to database/xapian-{core,bindings} and 
www/xapian-omega. Minor update barring needing to override the autoconf
cache in xapian-core and xapian-omega. Upstream is aware of this and 
will be fixed in the next version. There was an accidental collision
on autoconf variable names from infrastructure/db/config.site

Which leads me into another question. The Special Topics[0] page makes
note that "A few configure scripts may have bugs that will prevent
them from running correctly in the presence of config.site. Setting
CONFIG_SITE to empty will weed out these kind of problems".

For the life of me, I couldn't get setting CONFIG_SITE to empty to 
behave as stated in the docs. Grepping through the ports tree, mucking
with CONFIG_SITE seems to be extremely rare and setting it to empty 
doesn't appear to happen.

In xapian's case, the accidental collision is ac_cv_func_snprintf. This
should return snprintf, but db/config.site has yes. Setting CONFIG_SITE
to empty ought to prevent yes from being set as that value, but I kept
getting yes anyway: checking for  snprintf... (cached) yes

Happy to hear if I've done something wrong/misunderstood. Happier to be
shown that I'm not crazy.

Lucas

[0] https://www.openbsd.org/faq/ports/specialtopics.html#Autoconf
The Mechanics of Configure Checks, second paragraph
Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- databases/xapian-bindings/Makefile  28 Dec 2019 18:00:10 -0000      1.23
+++ databases/xapian-bindings/Makefile  25 Feb 2020 21:44:53 -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.14
+V=             1.4.15
 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.4
diff -u -p -r1.4 distinfo
--- databases/xapian-bindings/distinfo  28 Dec 2019 18:00:10 -0000      1.4
+++ databases/xapian-bindings/distinfo  25 Feb 2020 21:44:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.4.14.tar.xz) = 
VgnVaAZQ2KQkaD6z/jI53IRoNByr4IYee+UBizg7YWE=
-SIZE (xapian-bindings-1.4.14.tar.xz) = 1132008
+SHA256 (xapian-bindings-1.4.15.tar.xz) = 
aEQWEth5BKSQZuVwekLN4XHk1CO/itI/P2wEuKmyxAw=
+SIZE (xapian-bindings-1.4.15.tar.xz) = 1132248
Index: databases/xapian-core/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-core/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- databases/xapian-core/Makefile      28 Dec 2019 18:00:11 -0000      1.36
+++ databases/xapian-core/Makefile      25 Feb 2020 21:44:53 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       search engine library
 
-V=             1.4.14
+V=             1.4.15
 PORTROACH=     limitw:1,even
 DISTNAME=      xapian-core-${V}
 # the other xapian ports should be kept in-sync:
@@ -32,6 +32,7 @@ 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.13
diff -u -p -r1.13 distinfo
--- databases/xapian-core/distinfo      28 Dec 2019 18:00:11 -0000      1.13
+++ databases/xapian-core/distinfo      25 Feb 2020 21:44:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-core-1.4.14.tar.xz) = 
l1p6wBjJ00oVzJSj7MiDIEQDRp90iQflxMZNCuwuSUk=
-SIZE (xapian-core-1.4.14.tar.xz) = 2970624
+SHA256 (xapian-core-1.4.15.tar.xz) = 
sWjpWRigHgFPtqbLziblNfgNpNR5G/paDgBR/Lb5UOo=
+SIZE (xapian-core-1.4.15.tar.xz) = 2988752
Index: databases/xapian-core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/xapian-core/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- databases/xapian-core/pkg/PLIST     28 Dec 2019 18:00:11 -0000      1.10
+++ databases/xapian-core/pkg/PLIST     25 Feb 2020 21:44:54 -0000
@@ -368,7 +368,6 @@ share/doc/xapian-core/apidoc/html/files.
 share/doc/xapian-core/apidoc/html/folderclosed.png
 share/doc/xapian-core/apidoc/html/folderopen.png
 share/doc/xapian-core/apidoc/html/functions.html
-share/doc/xapian-core/apidoc/html/functions_0x7e.html
 share/doc/xapian-core/apidoc/html/functions_b.html
 share/doc/xapian-core/apidoc/html/functions_c.html
 share/doc/xapian-core/apidoc/html/functions_d.html
@@ -377,7 +376,6 @@ share/doc/xapian-core/apidoc/html/functi
 share/doc/xapian-core/apidoc/html/functions_eval.html
 share/doc/xapian-core/apidoc/html/functions_f.html
 share/doc/xapian-core/apidoc/html/functions_func.html
-share/doc/xapian-core/apidoc/html/functions_func_0x7e.html
 share/doc/xapian-core/apidoc/html/functions_func_b.html
 share/doc/xapian-core/apidoc/html/functions_func_c.html
 share/doc/xapian-core/apidoc/html/functions_func_d.html
@@ -399,6 +397,7 @@ share/doc/xapian-core/apidoc/html/functi
 share/doc/xapian-core/apidoc/html/functions_func_u.html
 share/doc/xapian-core/apidoc/html/functions_func_v.html
 share/doc/xapian-core/apidoc/html/functions_func_w.html
+share/doc/xapian-core/apidoc/html/functions_func_~.html
 share/doc/xapian-core/apidoc/html/functions_g.html
 share/doc/xapian-core/apidoc/html/functions_h.html
 share/doc/xapian-core/apidoc/html/functions_i.html
@@ -417,6 +416,7 @@ share/doc/xapian-core/apidoc/html/functi
 share/doc/xapian-core/apidoc/html/functions_v.html
 share/doc/xapian-core/apidoc/html/functions_vars.html
 share/doc/xapian-core/apidoc/html/functions_w.html
+share/doc/xapian-core/apidoc/html/functions_~.html
 share/doc/xapian-core/apidoc/html/geospatial_8h.html
 share/doc/xapian-core/apidoc/html/globals.html
 share/doc/xapian-core/apidoc/html/globals_defs.html
Index: infrastructure/db/user.list
===================================================================
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.358
diff -u -p -r1.358 user.list
--- infrastructure/db/user.list 23 Jan 2020 00:36:56 -0000      1.358
+++ infrastructure/db/user.list 25 Feb 2020 21:45:10 -0000
@@ -355,3 +355,5 @@ id  user            group           port
 845 _snmpexporter      _snmpexporter   sysutils/snmp_exporter
 846 _dhcpcd            _dhcpcd         net/dhcpcd
 847 _iperf3            _iperf3         net/iperf3
+848 _neo4j             _neo4j          databases/neo4j
+849 _uwsgi             _uwsgi          www/uwsgi
Index: www/xapian-omega/Makefile
===================================================================
RCS file: /cvs/ports/www/xapian-omega/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- www/xapian-omega/Makefile   28 Dec 2019 18:00:11 -0000      1.27
+++ www/xapian-omega/Makefile   25 Feb 2020 21:45:31 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       web search application
 
-V=             1.4.14
+V=             1.4.15
 PORTROACH=     limitw:1,even
 DISTNAME=      xapian-omega-${V}
 
@@ -28,6 +28,7 @@ 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.11
diff -u -p -r1.11 distinfo
--- www/xapian-omega/distinfo   28 Dec 2019 18:00:11 -0000      1.11
+++ www/xapian-omega/distinfo   25 Feb 2020 21:45:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-omega-1.4.14.tar.xz) = 
iysWzVJAnDVQfREDy98Q2eq9C132TZ808MkGWl0ChsM=
-SIZE (xapian-omega-1.4.14.tar.xz) = 540532
+SHA256 (xapian-omega-1.4.15.tar.xz) = 
wxErkggJpCo7Y8yqF0Jbmi9V+aBqUJHEAkVfzzR/w9I=
+SIZE (xapian-omega-1.4.15.tar.xz) = 545916
Index: www/xapian-omega/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/xapian-omega/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- www/xapian-omega/pkg/PLIST  13 Nov 2017 23:36:05 -0000      1.4
+++ www/xapian-omega/pkg/PLIST  25 Feb 2020 21:45:31 -0000
@@ -23,6 +23,7 @@ share/doc/xapian-omega/
 share/doc/xapian-omega/cgiparams.html
 share/doc/xapian-omega/encodings.html
 share/doc/xapian-omega/index.html
+share/doc/xapian-omega/newformat.html
 share/doc/xapian-omega/omegascript.html
 share/doc/xapian-omega/overview.html
 share/doc/xapian-omega/quickstart.html

Reply via email to