5 files changed, 35 insertions, 27 deletions
diff --git a/textproc/xapian-omega/Makefile b/textproc/xapian-omega/Makefile
index 9b9407c5bc4..b9cea020b5e 100644
--- a/textproc/xapian-omega/Makefile
+++ b/textproc/xapian-omega/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:39:08 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2016/11/07 13:02:45 schmonz Exp $
 #
 
 DISTNAME=		xapian-omega-${VERSION}
-VERSION=		1.2.23
-PKGREVISION=		1
+VERSION=		1.4.1
 CATEGORIES=		textproc
 MASTER_SITES=		http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=		.tar.xz
diff --git a/textproc/xapian-omega/PLIST b/textproc/xapian-omega/PLIST
index 3fe44290c10..7e63a7cedc0 100644
--- a/textproc/xapian-omega/PLIST
+++ b/textproc/xapian-omega/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/23 18:21:16 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/11/07 13:02:45 schmonz Exp $
 bin/dbi2omega
 bin/htdig2omega
 bin/mbox2omega
 bin/omindex
+bin/omindex-list
 bin/scriptindex
+libexec/cgi-bin/mhtml2html
 libexec/cgi-bin/outlookmsg2html
+libexec/cgi-bin/rfc822tohtml
 libexec/cgi-bin/xapian-omega
+man/man1/omindex-list.1
 man/man1/omindex.1
 man/man1/scriptindex.1
 share/doc/xapian-omega/cgiparams.html
diff --git a/textproc/xapian-omega/distinfo b/textproc/xapian-omega/distinfo
index bdc410b2a25..dca40a1dfd4 100644
--- a/textproc/xapian-omega/distinfo
+++ b/textproc/xapian-omega/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2016/04/30 14:14:17 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2016/11/07 13:02:45 schmonz Exp $
 
-SHA1 (xapian-omega-1.2.23.tar.xz) = 8102ea0f74dc2671c459831301ca649875ae55d2
-RMD160 (xapian-omega-1.2.23.tar.xz) = e5531201838f1cc8cad5784851b7b473675ce2ab
-SHA512 (xapian-omega-1.2.23.tar.xz) = 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428
-Size (xapian-omega-1.2.23.tar.xz) = 437912 bytes
-SHA1 (patch-aa) = 3a76634c8fa525d2cc049e10c11520442d986dfa
-SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8
+SHA1 (xapian-omega-1.4.1.tar.xz) = 9f182e58a9355d76bc567030a72f6e3c0cce9c68
+RMD160 (xapian-omega-1.4.1.tar.xz) = e17c8848624e299fa59debcb73d03e6bdbb26f0d
+SHA512 (xapian-omega-1.4.1.tar.xz) = 19891f5d0e901027e734041fc29b223ef002029b9ffdb91797b8b382132fcf7c335114ca7bec0ff21970a7435758e24675f1577dbb615f3cacad105d8ee91415
+Size (xapian-omega-1.4.1.tar.xz) = 494868 bytes
+SHA1 (patch-aa) = 044771ca449b9d2f29695d8034c3d90aa7aa0200
+SHA1 (patch-ab) = 6de115aab051256e911d61d69255f5af8916f058
diff --git a/textproc/xapian-omega/patches/patch-aa b/textproc/xapian-omega/patches/patch-aa
index cd11febfc18..a24b987e1ef 100644
--- a/textproc/xapian-omega/patches/patch-aa
+++ b/textproc/xapian-omega/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.7 2015/05/23 18:21:16 schmonz Exp $
+$NetBSD: patch-aa,v 1.8 2016/11/07 13:02:45 schmonz Exp $
 
 Call it "xapian-omega" and follow hier(7).
 
---- Makefile.in.orig	2015-05-21 06:11:47.000000000 +0000
+--- Makefile.in.orig	2016-10-21 04:54:57.000000000 +0000
 +++ Makefile.in
-@@ -55,7 +55,7 @@ PRE_UNINSTALL = :
+@@ -92,7 +92,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
 -pkglibbin_PROGRAMS = omega$(EXEEXT)
 +pkglibbin_PROGRAMS = xapian-omega$(EXEEXT)
- bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT)
- check_PROGRAMS = atomparsetest$(EXEEXT) htmlparsetest$(EXEEXT) \
- 	md5test$(EXEEXT) urlenctest$(EXEEXT) utf8converttest$(EXEEXT)
-@@ -471,7 +471,7 @@ AM_CPPFLAGS = \
+ bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) \
+ 	omindex-list$(EXEEXT)
+ check_PROGRAMS = atomparsetest$(EXEEXT) csvesctest$(EXEEXT) \
+@@ -771,7 +771,7 @@ AM_CPPFLAGS = \
  	-DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
  	-DPKGLIBBINDIR=\"$(pkglibbindir)\"
  
 -pkglibbindir = $(pkglibdir)/bin
 +pkglibbindir = $(libexecdir)/cgi-bin
- dist_pkglibbin_SCRIPTS = outlookmsg2html
+ dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml
  dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
- TESTS = atomparsetest$(EXEEXT)\
-@@ -480,7 +480,7 @@ TESTS = atomparsetest$(EXEEXT)\
+ dist_check_SCRIPTS = omegatest
+@@ -786,7 +786,7 @@ TESTS = atomparsetest$(EXEEXT)\
  	urlenctest$(EXEEXT)\
  	utf8converttest$(EXEEXT)
  
@@ -31,14 +31,14 @@ Call it "xapian-omega" and follow hier(7).
  dist_omegadata_DATA = htdig2omega.script mbox2omega.script
  dist_sysconf_DATA = omega.conf
  
-@@ -736,8 +736,8 @@ common/$(DEPDIR)/$(am__dirstamp):
- 	@: > common/$(DEPDIR)/$(am__dirstamp)
+@@ -1079,8 +1079,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
  common/str.$(OBJEXT): common/$(am__dirstamp) \
  	common/$(DEPDIR)/$(am__dirstamp)
+ 
 -omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) 
 -	@rm -f omega$(EXEEXT)
 +xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) 
 +	@rm -f xapian-omega$(EXEEXT)
- 	$(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS)
+ 	$(AM_V_CXXLD)$(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS)
  common/getopt.$(OBJEXT): common/$(am__dirstamp) \
  	common/$(DEPDIR)/$(am__dirstamp)
diff --git a/textproc/xapian-omega/patches/patch-ab b/textproc/xapian-omega/patches/patch-ab
index 1bbd4cea371..f368e2f246b 100644
--- a/textproc/xapian-omega/patches/patch-ab
+++ b/textproc/xapian-omega/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2013/06/04 21:28:26 schmonz Exp $
+$NetBSD: patch-ab,v 1.4 2016/11/07 13:02:45 schmonz Exp $
 
 Respect ${VARBASE} and follow hier(7).
 
---- omega.conf.orig	2013-04-17 00:01:38.000000000 +0000
+--- omega.conf.orig	2016-10-21 04:54:32.000000000 +0000
 +++ omega.conf
-@@ -1,11 +1,11 @@
+@@ -1,8 +1,8 @@
  # Directory containing Xapian databases:
 -database_dir /var/lib/omega/data
 +database_dir @VARBASE@/xapian-omega/data
@@ -13,6 +13,11 @@ Respect ${VARBASE} and follow hier(7).
 -template_dir /var/lib/omega/templates
 +template_dir @VARBASE@/xapian-omega/templates
  
+ # Default template name if the CGI parameter "FMT" is not specified.
+ # (If not specified here, the default template name is "query"):
+@@ -13,7 +13,7 @@ template_dir /var/lib/omega/templates
+ #default_db default
+ 
  # Directory to write Omega logs to:
 -log_dir /var/log/omega
 +log_dir @VARBASE@/log/xapian-omega