Thu Aug 27 13:22:42 2009 UTC ()
Update to 1.0.15. From the changelog:

general:
* omegascript.vim: The list of OmegaScript commands in the vim mode was rather
  out of date, and a few commands were misclassified.  Fix both problems and
  avoid future recurrences by automatically generating those lists from the
  command list in query.cc.

documentation:
* omegascript.html: Document that $date uses UTC.  (ticket#314)

templates:
* query: Link to "xapian.org" rather than "www.xapian.org".
* inc/toptermsjs: Use double-quotes rather than single quotes for parameter
  values on the <script> tag.

portability:
* omindex: Implement correct handling of paths when calling external filter
  programs on Microsoft Windows.


(schmonz)
diff -r1.10 -r1.11 pkgsrc/textproc/xapian-omega/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/xapian-omega/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/patch-aa
cvs diff -r1.10 -r1.11 pkgsrc/textproc/xapian-omega/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/Makefile 2009/07/23 19:27:21 1.10
+++ pkgsrc/textproc/xapian-omega/Makefile 2009/08/27 13:22:42 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.10 2009/07/23 19:27:21 schmonz Exp $ 1# $NetBSD: Makefile,v 1.11 2009/08/27 13:22:42 schmonz Exp $
2# 2#
3 3
4DISTNAME= xapian-omega-1.0.14 4DISTNAME= xapian-omega-1.0.15
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.14/ 6MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.15/
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= http://xapian.org/docs/omega/overview.html 9HOMEPAGE= http://xapian.org/docs/omega/overview.html
10COMMENT= Search engine application for websites using Xapian 10COMMENT= Search engine application for websites using Xapian
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= perl:run 19USE_TOOLS+= perl:run
cvs diff -r1.6 -r1.7 pkgsrc/textproc/xapian-omega/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/distinfo 2009/07/23 19:27:21 1.6
+++ pkgsrc/textproc/xapian-omega/distinfo 2009/08/27 13:22:42 1.7
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.6 2009/07/23 19:27:21 schmonz Exp $ 1$NetBSD: distinfo,v 1.7 2009/08/27 13:22:42 schmonz Exp $
2 2
3SHA1 (xapian-omega-1.0.14.tar.gz) = 74564229085a48aa9e717799c2f63556ea469174 3SHA1 (xapian-omega-1.0.15.tar.gz) = 0d69f38692f6546ff67f33f0c3d122e4a23749b4
4RMD160 (xapian-omega-1.0.14.tar.gz) = ce504de61aef639fa52333425967b83849d8571c 4RMD160 (xapian-omega-1.0.15.tar.gz) = 771c93712524b04e935792570f23b735745bde2a
5Size (xapian-omega-1.0.14.tar.gz) = 507723 bytes 5Size (xapian-omega-1.0.15.tar.gz) = 511038 bytes
6SHA1 (patch-aa) = ce457e51d62ecc8833b1f1f7b9aaeddf6f39bf98 6SHA1 (patch-aa) = a95ffd453b84c39d1b2b912aefd90af6929e2f1d
7SHA1 (patch-ab) = 6e845f6a61d7e36715b4a1bde217ff31ea0999e5 7SHA1 (patch-ab) = 6e845f6a61d7e36715b4a1bde217ff31ea0999e5
8SHA1 (patch-ac) = 49dc336eefdd1bafd8343e60ad01412127753989 8SHA1 (patch-ac) = 49dc336eefdd1bafd8343e60ad01412127753989
9SHA1 (patch-ad) = 4a09fdb782f11cb94040cd892dcd0b92bd8d1785 9SHA1 (patch-ad) = 4a09fdb782f11cb94040cd892dcd0b92bd8d1785
10SHA1 (patch-ae) = 4908628165c5bd563f66703fe029348bfb1c62ee 10SHA1 (patch-ae) = 4908628165c5bd563f66703fe029348bfb1c62ee
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa 2008/07/26 23:37:29 1.1.1.1
+++ pkgsrc/textproc/xapian-omega/patches/Attic/patch-aa 2009/08/27 13:22:42 1.2
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/07/26 23:37:29 schmonz Exp $ 1$NetBSD: patch-aa,v 1.2 2009/08/27 13:22:42 schmonz Exp $
2 2
3--- Makefile.in.orig 2008-07-16 00:46:59.000000000 -0400 3--- Makefile.in.orig 2009-08-26 17:52:54.000000000 -0400
4+++ Makefile.in 4+++ Makefile.in
5@@ -35,7 +35,7 @@ PRE_UNINSTALL = : 5@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
6 POST_UNINSTALL = : 6 POST_UNINSTALL = :
7 build_triplet = @build@ 7 build_triplet = @build@
8 host_triplet = @host@ 8 host_triplet = @host@
9-pkglibbin_PROGRAMS = omega$(EXEEXT) 9-pkglibbin_PROGRAMS = omega$(EXEEXT)
10+pkglibbin_PROGRAMS = xapian-omega$(EXEEXT) 10+pkglibbin_PROGRAMS = xapian-omega$(EXEEXT)
11 bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) 11 bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT)
12 check_PROGRAMS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) \ 12 check_PROGRAMS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) \
13 utf8converttest$(EXEEXT) 13 utf8converttest$(EXEEXT)
14@@ -332,10 +332,10 @@ EXTRA_DIST = \ 14@@ -336,10 +336,10 @@ EXTRA_DIST = \
15 xapian-omega.spec 15 xapian-omega.spec
16  16
17 AM_CPPFLAGS = -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" 17 AM_CPPFLAGS = -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\"
18-pkglibbindir = $(pkglibdir)/bin 18-pkglibbindir = $(pkglibdir)/bin
19+pkglibbindir = $(libexecdir)/cgi-bin 19+pkglibbindir = $(libexecdir)/cgi-bin
20 dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega 20 dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
21 TESTS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) utf8converttest$(EXEEXT) 21 TESTS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) utf8converttest$(EXEEXT)
22-omegadatadir = $(datadir)/omega 22-omegadatadir = $(datadir)/omega
23+omegadatadir = $(datadir)/xapian-omega 23+omegadatadir = $(datadir)/xapian-omega
24 dist_omegadata_DATA = htdig2omega.script mbox2omega.script 24 dist_omegadata_DATA = htdig2omega.script mbox2omega.script
25 dist_sysconf_DATA = omega.conf 25 dist_sysconf_DATA = omega.conf
26  26
27@@ -506,8 +506,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ 27@@ -510,8 +510,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_
28 md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES)  28 md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES)
29 @rm -f md5test$(EXEEXT) 29 @rm -f md5test$(EXEEXT)
30 $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS) 30 $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS)
31-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES)  31-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES)
32- @rm -f omega$(EXEEXT) 32- @rm -f omega$(EXEEXT)
33+xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES)  33+xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES)
34+ @rm -f xapian-omega$(EXEEXT) 34+ @rm -f xapian-omega$(EXEEXT)
35 $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS) 35 $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS)
36 omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES)  36 omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES)
37 @rm -f omindex$(EXEEXT) 37 @rm -f omindex$(EXEEXT)