Sun Jul 6 15:21:32 2014 UTC ()
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.


(schmonz)
diff -r1.23 -r1.24 pkgsrc/textproc/xapian-omega/Makefile
diff -r1.12 -r1.13 pkgsrc/textproc/xapian-omega/distinfo
diff -r1.5 -r1.6 pkgsrc/textproc/xapian-omega/patches/patch-aa
cvs diff -r1.23 -r1.24 pkgsrc/textproc/xapian-omega/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/Makefile 2014/05/29 23:37:50 1.23
+++ pkgsrc/textproc/xapian-omega/Makefile 2014/07/06 15:21:32 1.24
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2014/05/29 23:37:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2014/07/06 15:21:32 schmonz Exp $
2# 2#
3 3
4DISTNAME= xapian-omega-${VERSION} 4DISTNAME= xapian-omega-${VERSION}
5VERSION= 1.2.17 5VERSION= 1.2.18
6PKGREVISION= 1 
7CATEGORIES= textproc 6CATEGORIES= textproc
8MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/ 7MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/
9EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
10 9
11MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
12HOMEPAGE= http://xapian.org/docs/omega/overview.html 11HOMEPAGE= http://xapian.org/docs/omega/overview.html
13COMMENT= Search engine application for websites using Xapian 12COMMENT= Search engine application for websites using Xapian
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
cvs diff -r1.12 -r1.13 pkgsrc/textproc/xapian-omega/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/distinfo 2014/02/20 19:15:43 1.12
+++ pkgsrc/textproc/xapian-omega/distinfo 2014/07/06 15:21:32 1.13
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.12 2014/02/20 19:15:43 schmonz Exp $ 1$NetBSD: distinfo,v 1.13 2014/07/06 15:21:32 schmonz Exp $
2 2
3SHA1 (xapian-omega-1.2.17.tar.xz) = 245fb742042ff15d234dd68b1372837c4d5993ba 3SHA1 (xapian-omega-1.2.18.tar.xz) = 9b0060c639ebb53e9b2dd6928019e06d0fd24ced
4RMD160 (xapian-omega-1.2.17.tar.xz) = 4b0bac3194c4c1a48e12c1c5f2e07c2e979af145 4RMD160 (xapian-omega-1.2.18.tar.xz) = f0f74e95cdd33a186c658dac95514f16a313ca82
5Size (xapian-omega-1.2.17.tar.xz) = 417900 bytes 5Size (xapian-omega-1.2.18.tar.xz) = 419784 bytes
6SHA1 (patch-aa) = f4cce1d8a5b535bf32c024b40eb24b66942299e3 6SHA1 (patch-aa) = 3c3a50fd7d2e3937b5c6f8519a564cf4efcc7339
7SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8 7SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8
cvs diff -r1.5 -r1.6 pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa 2014/02/20 19:15:44 1.5
+++ pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa 2014/07/06 15:21:32 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-aa,v 1.5 2014/02/20 19:15:44 schmonz Exp $ 1$NetBSD: patch-aa,v 1.6 2014/07/06 15:21:32 schmonz Exp $
2 2
3Call it "xapian-omega" and follow hier(7). 3Call it "xapian-omega" and follow hier(7).
4 4
5--- Makefile.in.orig 2014-01-29 03:14:38.000000000 +0000 5--- Makefile.in.orig 2014-06-22 07:05:39.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -55,7 +55,7 @@ PRE_UNINSTALL = : 7@@ -55,7 +55,7 @@ PRE_UNINSTALL = :
8 POST_UNINSTALL = : 8 POST_UNINSTALL = :
9 build_triplet = @build@ 9 build_triplet = @build@
10 host_triplet = @host@ 10 host_triplet = @host@
11-pkglibbin_PROGRAMS = omega$(EXEEXT) 11-pkglibbin_PROGRAMS = omega$(EXEEXT)
12+pkglibbin_PROGRAMS = xapian-omega$(EXEEXT) 12+pkglibbin_PROGRAMS = xapian-omega$(EXEEXT)
13 bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) 13 bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT)
14 check_PROGRAMS = atomparsetest$(EXEEXT) htmlparsetest$(EXEEXT) \ 14 check_PROGRAMS = atomparsetest$(EXEEXT) htmlparsetest$(EXEEXT) \
15 md5test$(EXEEXT) urlenctest$(EXEEXT) utf8converttest$(EXEEXT) 15 md5test$(EXEEXT) urlenctest$(EXEEXT) utf8converttest$(EXEEXT)
16@@ -461,7 +461,7 @@ AM_CPPFLAGS = \ 16@@ -461,7 +461,7 @@ AM_CPPFLAGS = \
17 -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ 17 -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
18 -DPKGLIBBINDIR=\"$(pkglibbindir)\" 18 -DPKGLIBBINDIR=\"$(pkglibbindir)\"
@@ -21,24 +21,24 @@ Call it "xapian-omega" and follow hier(7 @@ -21,24 +21,24 @@ Call it "xapian-omega" and follow hier(7
21+pkglibbindir = $(libexecdir)/cgi-bin 21+pkglibbindir = $(libexecdir)/cgi-bin
22 dist_pkglibbin_SCRIPTS = outlookmsg2html 22 dist_pkglibbin_SCRIPTS = outlookmsg2html
23 dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega 23 dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
24 TESTS = atomparsetest$(EXEEXT)\ 24 TESTS = atomparsetest$(EXEEXT)\
25@@ -470,7 +470,7 @@ TESTS = atomparsetest$(EXEEXT)\ 25@@ -470,7 +470,7 @@ TESTS = atomparsetest$(EXEEXT)\
26 urlenctest$(EXEEXT)\ 26 urlenctest$(EXEEXT)\
27 utf8converttest$(EXEEXT) 27 utf8converttest$(EXEEXT)
28  28
29-omegadatadir = $(datadir)/omega 29-omegadatadir = $(datadir)/omega
30+omegadatadir = $(datadir)/xapian-omega 30+omegadatadir = $(datadir)/xapian-omega
31 dist_omegadata_DATA = htdig2omega.script mbox2omega.script 31 dist_omegadata_DATA = htdig2omega.script mbox2omega.script
32 dist_sysconf_DATA = omega.conf 32 dist_sysconf_DATA = omega.conf
33  33
34@@ -715,8 +715,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ 34@@ -716,8 +716,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_
35 md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) $(EXTRA_md5test_DEPENDENCIES)  35 md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) $(EXTRA_md5test_DEPENDENCIES)
36 @rm -f md5test$(EXEEXT) 36 @rm -f md5test$(EXEEXT)
37 $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS) 37 $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS)
38-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES)  38-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES)
39- @rm -f omega$(EXEEXT) 39- @rm -f omega$(EXEEXT)
40+xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES)  40+xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES)
41+ @rm -f xapian-omega$(EXEEXT) 41+ @rm -f xapian-omega$(EXEEXT)
42 $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS) 42 $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS)
43 omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) $(EXTRA_omindex_DEPENDENCIES)  43 omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) $(EXTRA_omindex_DEPENDENCIES)
44 @rm -f omindex$(EXEEXT) 44 @rm -f omindex$(EXEEXT)