Update to 1.2.18. From the changelog:

indexers:

* omindex:

  + Work around libmagic returning a MIME content-type of "Composite Document
    File V2 Document[...]" or "application/CDFV2-corrupt" by returning a more
    suitable filetype based on looking at the file's extension.

  + The starting URL wasn't previously URL encoded.  In 1.3.2, this will be
    fixed by URL encoding it as we do for the rest of the path, for the 1.2
    branch we only URL encode it if it contains a character <= 31 or at least
    one of '#', '%', ':' or '?'.  This avoids a one-off reindex of every
    document in the database in cases which work OK in practice.

  + When we skip a file because it exceeds the configured size limit, include
    that size limit in the message.

omega:

* Add support for setting the query expansion scheme to use.

portability:

* Don't compile in unixperm.cc - it isn't currently used, and it fails to build
  with mingw.  (fixes #635, reported by Alexis Denis)

* Fix warning when built with GCC 4.7.2 using -Os.

* Removed unused inline function, fixing compiler warning.

3 files changed, 10 insertions, 11 deletions

diff --git a/textproc/xapian-omega/Makefile b/textproc/xapian-omega/Makefile
index 182d4cd18d3..bc47447277d 100644
--- a/textproc/xapian-omega/Makefile
+++ b/textproc/xapian-omega/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/29 23:37:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/07/06 15:21:32 schmonz Exp $
 #
 
 DISTNAME=		xapian-omega-${VERSION}
-VERSION=		1.2.17
-PKGREVISION=		1
+VERSION=		1.2.18
 CATEGORIES=		textproc
 MASTER_SITES=		http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=		.tar.xz
diff --git a/textproc/xapian-omega/distinfo b/textproc/xapian-omega/distinfo
index e9f2cd088dc..641d0e41591 100644
--- a/textproc/xapian-omega/distinfo
+++ b/textproc/xapian-omega/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2014/02/20 19:15:43 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2014/07/06 15:21:32 schmonz Exp $
 
-SHA1 (xapian-omega-1.2.17.tar.xz) = 245fb742042ff15d234dd68b1372837c4d5993ba
-RMD160 (xapian-omega-1.2.17.tar.xz) = 4b0bac3194c4c1a48e12c1c5f2e07c2e979af145
-Size (xapian-omega-1.2.17.tar.xz) = 417900 bytes
-SHA1 (patch-aa) = f4cce1d8a5b535bf32c024b40eb24b66942299e3
+SHA1 (xapian-omega-1.2.18.tar.xz) = 9b0060c639ebb53e9b2dd6928019e06d0fd24ced
+RMD160 (xapian-omega-1.2.18.tar.xz) = f0f74e95cdd33a186c658dac95514f16a313ca82
+Size (xapian-omega-1.2.18.tar.xz) = 419784 bytes
+SHA1 (patch-aa) = 3c3a50fd7d2e3937b5c6f8519a564cf4efcc7339
 SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8
diff --git a/textproc/xapian-omega/patches/patch-aa b/textproc/xapian-omega/patches/patch-aa
index 262fe68e13e..8d291b4357a 100644
--- a/textproc/xapian-omega/patches/patch-aa
+++ b/textproc/xapian-omega/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2014/02/20 19:15:44 schmonz Exp $
+$NetBSD: patch-aa,v 1.6 2014/07/06 15:21:32 schmonz Exp $
 
 Call it "xapian-omega" and follow hier(7).
 
---- Makefile.in.orig	2014-01-29 03:14:38.000000000 +0000
+--- Makefile.in.orig	2014-06-22 07:05:39.000000000 +0000
 +++ Makefile.in
 @@ -55,7 +55,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -31,7 +31,7 @@ Call it "xapian-omega" and follow hier(7).
  dist_omegadata_DATA = htdig2omega.script mbox2omega.script
  dist_sysconf_DATA = omega.conf
  
-@@ -715,8 +715,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_
+@@ -716,8 +716,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_
  md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) $(EXTRA_md5test_DEPENDENCIES) 
  	@rm -f md5test$(EXEEXT)
  	$(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS)