CVS commit: pkgsrc/textproc/xapian-omega

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jul  9 22:27:47 UTC 2017

Modified Files:
        pkgsrc/textproc/xapian-omega: Makefile PLIST distinfo
        pkgsrc/textproc/xapian-omega/patches: patch-aa

Log Message:
Update to 1.4.4. From the changelog:

indexers:

* omindex:

  + 1.4.3 added a new --sample option, but contrary to the documentation
    the default behaviour was to take the sample from the meta description
    (which was the hard-wired behaviour in 1.4.2 and earlier).  The default
    has now been changed to take the sample from the body.

  + Index .shtm, .xhtml and .xhtm as HTML by default - .shtm is another
    extension used for server-parsed HTML (in addition to the more common
    .shtml), and .xhtm and .xhtml are XHTML.

  + Fix fallback lookup for extension containing upper case.  User mappings
    worked, but built-in extension to MIME type mappings were effectively being
    ignored (because the result of the function call was not being checked).
    Bug introduced in 1.3.4.

  + Fix term-based date ranges, broken by changes in 1.4.2.  Found and
    diagnosed by Gaurav Arora.

  + Handle date range with start after end better - with term-based ranges,
    this used to generate a bogus filter, but now just generates Dlatest.

  + Use Y-term when range starts/ends at year start/end.  Previously we used 12
    M-terms for these cases.

  + Use full leap-year check when constructing term-based date ranges -
    previous code was good until 2100, but even then it would only result
    in an extra term being included for a non-existent February 29th in
    rare cases.

  + Add support for indexing vCard files if Perl and its Text::vCard module
    are available.

  + Recognise application/x-rpm as alternative type since libmagic reports this
    rather than application/x-redhat-package-manager.

  + Use official MIME type application/vnd.debian.binary-package for debian
    packages.  We used to map .deb and .udeb to application/x-debian-package,
    but in 2014 (after we added that support for .deb) an official type was
    registered with IANA.  We now map extensions .deb and .udeb to the official
    type, but the unofficial type is still recognised (older versions of
    libmagic probably report it, and users may be mapping to it).

  + Handle PHP as MIME type text/x-php.  The main difference this makes is that
    PHP files which don't have extension '.php' (e.g. .phtml, .phps, .php5,
    .ph4, etc) get identified by libmagic as text/x-php and will now be indexed.
    It also means that the user can now more easily configure different filters
    for HTML and PHP.

  + Don't use meta description as sample by default.  Now we have dynamic
    snippets (via $snippet), the body text is a better default.  Also generated
    HTML sometimes has unhelpful content in the meta description.  To get the
    previous behaviour, use the new omindex command line option:
    --sample=description

omega:

* New OmegaScript command $cgiparams which returns a list of the parameter
  names.

* Handle tab in a CGI parameter name in the same way as space.  Mostly this is
  a way to avoid having tabs in CGI parameter names - they aren't useful, but
  if they could have tabs in we can't put CGI parameter names in a list.

templates:

* query: Fix highlighting of matching terms.  We were using both $snippet and
  $highlight, which results in double highlighting and HTML escaping, most
  noticeable by literal <strong> and </strong> appearing around matching terms
  in the rendered HTML snippet.  Reported by Mark Thomas on xapian-discuss.

build system:

* If gen-mimemap failed after creating mimemap.h, the rule wouldn't get rerun.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/xapian-omega/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/xapian-omega/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/xapian-omega/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/xapian-omega/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xapian-omega/Makefile
diff -u pkgsrc/textproc/xapian-omega/Makefile:1.34 pkgsrc/textproc/xapian-omega/Makefile:1.35
--- pkgsrc/textproc/xapian-omega/Makefile:1.34  Mon May  8 12:02:06 2017
+++ pkgsrc/textproc/xapian-omega/Makefile       Sun Jul  9 22:27:47 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2017/05/08 12:02:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.35 2017/07/09 22:27:47 schmonz Exp $
 
 DISTNAME=              xapian-omega-${VERSION}
-VERSION=               1.4.2
+VERSION=               1.4.4
 CATEGORIES=            textproc
 MASTER_SITES=          http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/textproc/xapian-omega/PLIST
diff -u pkgsrc/textproc/xapian-omega/PLIST:1.6 pkgsrc/textproc/xapian-omega/PLIST:1.7
--- pkgsrc/textproc/xapian-omega/PLIST:1.6      Mon Nov  7 13:02:45 2016
+++ pkgsrc/textproc/xapian-omega/PLIST  Sun Jul  9 22:27:47 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/11/07 13:02:45 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/07/09 22:27:47 schmonz Exp $
 bin/dbi2omega
 bin/htdig2omega
 bin/mbox2omega
@@ -8,6 +8,7 @@ bin/scriptindex
 libexec/cgi-bin/mhtml2html
 libexec/cgi-bin/outlookmsg2html
 libexec/cgi-bin/rfc822tohtml
+libexec/cgi-bin/vcard2text
 libexec/cgi-bin/xapian-omega
 man/man1/omindex-list.1
 man/man1/omindex.1

Index: pkgsrc/textproc/xapian-omega/distinfo
diff -u pkgsrc/textproc/xapian-omega/distinfo:1.20 pkgsrc/textproc/xapian-omega/distinfo:1.21
--- pkgsrc/textproc/xapian-omega/distinfo:1.20  Sun Jan  1 10:41:03 2017
+++ pkgsrc/textproc/xapian-omega/distinfo       Sun Jul  9 22:27:47 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2017/01/01 10:41:03 schmonz Exp $
+$NetBSD: distinfo,v 1.21 2017/07/09 22:27:47 schmonz Exp $
 
-SHA1 (xapian-omega-1.4.2.tar.xz) = 146f56c8688d2dbc9c4e8294906e1e67195f89f0
-RMD160 (xapian-omega-1.4.2.tar.xz) = f8c5a145479884cd28b987f8ec01481afd521068
-SHA512 (xapian-omega-1.4.2.tar.xz) = 2686f11d6aa84723f6f863ad4101c13f4f13b977f7f9fcd03108491418f5761117b500232b73f4f405c34dce2e0f6fed14719b0924cf20561f08a439b5032e63
-Size (xapian-omega-1.4.2.tar.xz) = 496872 bytes
-SHA1 (patch-aa) = 044771ca449b9d2f29695d8034c3d90aa7aa0200
+SHA1 (xapian-omega-1.4.4.tar.xz) = 96f01b801157244945833f3d3e478bc730f3395d
+RMD160 (xapian-omega-1.4.4.tar.xz) = 7a143c26353900b3bbb2a12c82a0ef46fcc048bd
+SHA512 (xapian-omega-1.4.4.tar.xz) = 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533
+Size (xapian-omega-1.4.4.tar.xz) = 501712 bytes
+SHA1 (patch-aa) = eea809d9403820e86478d939a2dad4c67358ebf5
 SHA1 (patch-ab) = 6de115aab051256e911d61d69255f5af8916f058

Index: pkgsrc/textproc/xapian-omega/patches/patch-aa
diff -u pkgsrc/textproc/xapian-omega/patches/patch-aa:1.8 pkgsrc/textproc/xapian-omega/patches/patch-aa:1.9
--- pkgsrc/textproc/xapian-omega/patches/patch-aa:1.8   Mon Nov  7 13:02:45 2016
+++ pkgsrc/textproc/xapian-omega/patches/patch-aa       Sun Jul  9 22:27:47 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2016/11/07 13:02:45 schmonz Exp $
+$NetBSD: patch-aa,v 1.9 2017/07/09 22:27:47 schmonz Exp $
 
 Call it "xapian-omega" and follow hier(7).
 
---- Makefile.in.orig   2016-10-21 04:54:57.000000000 +0000
+--- Makefile.in.orig   2017-04-24 02:19:50.000000000 +0000
 +++ Makefile.in
 @@ -92,7 +92,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -13,16 +13,16 @@ Call it "xapian-omega" and follow hier(7
  bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) \
        omindex-list$(EXEEXT)
  check_PROGRAMS = atomparsetest$(EXEEXT) csvesctest$(EXEEXT) \
-@@ -771,7 +771,7 @@ AM_CPPFLAGS = \
+@@ -791,7 +791,7 @@ AM_CPPFLAGS = \
        -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
        -DPKGLIBBINDIR=\"$(pkglibbindir)\"
  
 -pkglibbindir = $(pkglibdir)/bin
 +pkglibbindir = $(libexecdir)/cgi-bin
- dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml
+ dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text
  dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
  dist_check_SCRIPTS = omegatest
-@@ -786,7 +786,7 @@ TESTS = atomparsetest$(EXEEXT)\
+@@ -804,7 +804,7 @@ TESTS = atomparsetest$(EXEEXT)\
        urlenctest$(EXEEXT)\
        utf8converttest$(EXEEXT)
  
@@ -31,7 +31,7 @@ Call it "xapian-omega" and follow hier(7
  dist_omegadata_DATA = htdig2omega.script mbox2omega.script
  dist_sysconf_DATA = omega.conf
  
-@@ -1079,8 +1079,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
+@@ -1099,8 +1099,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
  common/str.$(OBJEXT): common/$(am__dirstamp) \
        common/$(DEPDIR)/$(am__dirstamp)