Date: Sat, 18 Apr 2026 22:01:38 +0000 From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9adb11d1b6e7 - main - www/xapian-omega: Update to 2.0.0 Message-ID: <69e3ff42.33948.8c1edb1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9adb11d1b6e73e60c12c9063ba645e09f1e2f70b commit 9adb11d1b6e73e60c12c9063ba645e09f1e2f70b Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2026-04-18 21:22:45 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2026-04-18 21:51:29 +0000 www/xapian-omega: Update to 2.0.0 - Update CONFLICTS_INSTALL Changes: https://trac.xapian.org/wiki/ReleaseOverview https://github.com/xapian/xapian/blob/main/xapian-omega/NEWS --- www/xapian-omega/Makefile | 10 +++++----- www/xapian-omega/distinfo | 6 +++--- www/xapian-omega/files/patch-Makefile.in | 14 +++++++------- www/xapian-omega/pkg-plist | 2 -- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile index 873afd62c81c..1aa0ab83a25a 100644 --- a/www/xapian-omega/Makefile +++ b/www/xapian-omega/Makefile @@ -1,5 +1,5 @@ PORTNAME= xapian-omega -PORTVERSION= 1.4.31 +PORTVERSION= 2.0.0 CATEGORIES= www MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet @@ -15,19 +15,19 @@ BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/xapian-core LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libxapian.so:databases/xapian-core -USES= compiler:c++11-lang libtool localbase perl5 shebangfix tar:xz +USES= compiler:c++17-lang libtool localbase perl5 pkgconfig shebangfix tar:xz CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} \ ac_cv_func_snprintf=snprintf CONFIGURE_ENV= XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config GNU_CONFIGURE= yes -USE_CXXSTD= c++11 +USE_CXXSTD= c++17 -CONFLICTS_INSTALL= xapian-omega12 +CONFLICTS_INSTALL= xapian-omega14 PORTSCOUT= limitw:1,even -SHEBANG_FILES= dbi2omega htdig2omega mbox2omega +SHEBANG_FILES= dbi2omega mbox2omega OPTIONS_DEFINE= DOCS EXAMPLES ICONV OPTIONS_DEFAULT=ICONV diff --git a/www/xapian-omega/distinfo b/www/xapian-omega/distinfo index 0c13094de5a8..59a59e4968be 100644 --- a/www/xapian-omega/distinfo +++ b/www/xapian-omega/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1773966812 -SHA256 (xapian-omega-1.4.31.tar.xz) = a7dfb608dd8b3ea53dde85236d475796826069c4d126189ea33a793349b2317a -SIZE (xapian-omega-1.4.31.tar.xz) = 589208 +TIMESTAMP = 1775587172 +SHA256 (xapian-omega-2.0.0.tar.xz) = 85088a16cf64ea676d0856813244909f132e1b32013a56928c40a1e333a6734a +SIZE (xapian-omega-2.0.0.tar.xz) = 5823212 diff --git a/www/xapian-omega/files/patch-Makefile.in b/www/xapian-omega/files/patch-Makefile.in index 7c15c553211b..751635b4d3e2 100644 --- a/www/xapian-omega/files/patch-Makefile.in +++ b/www/xapian-omega/files/patch-Makefile.in @@ -1,18 +1,18 @@ ---- Makefile.in.orig 2023-02-02 01:01:36 UTC +--- Makefile.in.orig 2026-03-16 23:17:05 UTC +++ Makefile.in -@@ -841,7 +841,7 @@ AM_CPPFLAGS = \ +@@ -1118,7 +1118,7 @@ AM_CPPFLAGS = \ -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ -DPKGLIBBINDIR=\"$(pkglibbindir)\" -pkglibbindir = $(pkglibdir)/bin +pkglibbindir = $(prefix)/www/xapian-omega/cgi-bin dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text - dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega - dist_check_SCRIPTS = omegatest sourcetest -@@ -857,7 +857,6 @@ TESTS = atomparsetest$(EXEEXT)\ - + dist_bin_SCRIPTS = dbi2omega mbox2omega $(am__append_2) + dist_check_SCRIPTS = omegatest.pl sourcetest omindextest +@@ -1139,7 +1139,6 @@ dist_omegadata_DATA = mbox2omega.script + PL_LOG_COMPILER = $(PERL) omegadatadir = $(datadir)/omega - dist_omegadata_DATA = htdig2omega.script mbox2omega.script + dist_omegadata_DATA = mbox2omega.script -dist_sysconf_DATA = omega.conf # headers maintained in xapian-core diff --git a/www/xapian-omega/pkg-plist b/www/xapian-omega/pkg-plist index 16dbd7e0a9fb..f94fe792c5f9 100644 --- a/www/xapian-omega/pkg-plist +++ b/www/xapian-omega/pkg-plist @@ -1,5 +1,4 @@ bin/dbi2omega -bin/htdig2omega bin/mbox2omega bin/omindex bin/omindex-list @@ -30,7 +29,6 @@ bin/scriptindex share/man/man1/omindex-list.1.gz share/man/man1/omindex.1.gz share/man/man1/scriptindex.1.gz -%%DATADIR%%/omega/htdig2omega.script %%DATADIR%%/omega/mbox2omega.script %%WWWDIR%%/cgi-bin/mhtml2html %%WWWDIR%%/cgi-bin/omegahome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e3ff42.33948.8c1edb1>