Mon Apr 20 22:25:39 2009 UTC ()
Update to 1.0.12. From the changelog:

* $log now retries a partial write, or one interrupted by a system call.
* cgiparams.html: Note the technique of using a stub database file to allow a
  default of searching over multiple databases.
* omindex:
  + Add support for indexing Microsoft Office 2007 formats and XPS files
    (bug#290).
  + Fix the extraction of metadata from OpenDocument formats.
  + Fix "-l" which would previously always cause a segmentation fault if used
    ("--depth-limit" wasn't affected).
* Fix to compile when RLIMIT_AS isn't available (as on NetBSD and OpenBSD).
  Instead use RLIMIT_VMEM or RLIMIT_DATA if either is available, else don't try
  to limit the memory the filter process can use.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/textproc/xapian-omega/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/xapian-omega/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/patch-ae
diff -r1.2 -r0 pkgsrc/textproc/xapian-omega/patches/patch-af
cvs diff -r1.4 -r1.5 pkgsrc/textproc/xapian-omega/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/Makefile 2009/01/07 22:40:14 1.4
+++ pkgsrc/textproc/xapian-omega/Makefile 2009/04/20 22:25:38 1.5
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2009/01/07 22:40:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2009/04/20 22:25:38 schmonz Exp $
2# 2#
3 3
4DISTNAME= xapian-omega-1.0.10 4DISTNAME= xapian-omega-1.0.12
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.10/ 6MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.12/
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
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 13CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run 16USE_TOOLS+= perl:run
17 17
 18TEST_TARGET= check
 19
18REPLACE_PERL= dbi2omega htdig2omega mbox2omega 20REPLACE_PERL= dbi2omega htdig2omega mbox2omega
19 21
20SUBST_CLASSES+= files 22SUBST_CLASSES+= files
21SUBST_STAGE.files= do-configure 23SUBST_STAGE.files= do-configure
22SUBST_FILES.files= omega.conf 24SUBST_FILES.files= omega.conf
23SUBST_SED.files= -e "s|@VARBASE@|${VARBASE}|g" 25SUBST_SED.files= -e "s|@VARBASE@|${VARBASE}|g"
24SUBST_MESSAGE.files= Fixing configuration files. 26SUBST_MESSAGE.files= Fixing configuration files.
25 27
26OWN_DIRS+= ${VARBASE}/log/${PKGBASE} 28OWN_DIRS+= ${VARBASE}/log/${PKGBASE}
27OWN_DIRS+= ${VARBASE}/${PKGBASE}/cdb 29OWN_DIRS+= ${VARBASE}/${PKGBASE}/cdb
28OWN_DIRS+= ${VARBASE}/${PKGBASE}/data 30OWN_DIRS+= ${VARBASE}/${PKGBASE}/data
29OWN_DIRS+= ${VARBASE}/${PKGBASE}/templates 31OWN_DIRS+= ${VARBASE}/${PKGBASE}/templates
30 32
cvs diff -r1.3 -r1.4 pkgsrc/textproc/xapian-omega/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/distinfo 2009/01/07 22:40:14 1.3
+++ pkgsrc/textproc/xapian-omega/distinfo 2009/04/20 22:25:38 1.4
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.3 2009/01/07 22:40:14 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2009/04/20 22:25:38 schmonz Exp $
2 2
3SHA1 (xapian-omega-1.0.10.tar.gz) = 135a948efa841ca968ff676b855e834a5e9f6cd8 3SHA1 (xapian-omega-1.0.12.tar.gz) = c55216e54ac07e6a1f03ef6d3db9945ca76e8bad
4RMD160 (xapian-omega-1.0.10.tar.gz) = fd7a3db0b2691b7c32b34b45ecd0e2cb413eccc5 4RMD160 (xapian-omega-1.0.12.tar.gz) = ea3e31eb49656a6640d9330e396eafa8593cf835
5Size (xapian-omega-1.0.10.tar.gz) = 501840 bytes 5Size (xapian-omega-1.0.12.tar.gz) = 506229 bytes
6SHA1 (patch-aa) = ce457e51d62ecc8833b1f1f7b9aaeddf6f39bf98 6SHA1 (patch-aa) = ce457e51d62ecc8833b1f1f7b9aaeddf6f39bf98
7SHA1 (patch-ab) = 6e845f6a61d7e36715b4a1bde217ff31ea0999e5 7SHA1 (patch-ab) = 6e845f6a61d7e36715b4a1bde217ff31ea0999e5
8SHA1 (patch-ac) = e8c47ba1e3853f54d8fffc90d55318b7d3c2047f 8SHA1 (patch-ac) = 49dc336eefdd1bafd8343e60ad01412127753989
9SHA1 (patch-ad) = 1aa0b8d7a3a78d96edd087669ff46b76d1420a19 9SHA1 (patch-ad) = 4a09fdb782f11cb94040cd892dcd0b92bd8d1785
10SHA1 (patch-ae) = 1ebbce6ca463f12575baafef3a1acd3c2640bb5b 10SHA1 (patch-ae) = a3a82ee093da5b3338622f8bb3e93308f147da98
11SHA1 (patch-af) = 4091131fc560c2491a613ddce11eba044adbac6c 
cvs diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/patches/Attic/patch-ac 2008/07/27 04:06:00 1.1
+++ pkgsrc/textproc/xapian-omega/patches/Attic/patch-ac 2009/04/20 22:25:38 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.1 2008/07/27 04:06:00 schmonz Exp $ 1$NetBSD: patch-ac,v 1.2 2009/04/20 22:25:38 schmonz Exp $
2 2
3--- config.h.in.orig 2008-07-16 00:46:58.000000000 -0400 3--- config.h.in.orig 2009-04-19 08:33:24.000000000 -0400
4+++ config.h.in 4+++ config.h.in
5@@ -45,6 +45,9 @@ 5@@ -48,6 +48,9 @@
6 /* Define to 1 if you have the `pstat_getdynamic' function. */ 6 /* Define to 1 if you have the `pstat_getdynamic' function. */
7 #undef HAVE_PSTAT_GETDYNAMIC 7 #undef HAVE_PSTAT_GETDYNAMIC
8  8
9+/* Define to 1 if you have RLIMIT_AS for setrlimit(). */ 9+/* Define to 1 if you have RLIMIT_AS for setrlimit(). */
10+#undef HAVE_RLIMIT_AS 10+#undef HAVE_RLIMIT_AS
11+ 11+
12 /* Define to 1 if you have the `setrlimit' function. */ 12 /* Define to 1 if you have the `setrlimit' function. */
13 #undef HAVE_SETRLIMIT 13 #undef HAVE_SETRLIMIT
14  14
cvs diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/patches/Attic/patch-ad 2008/07/27 04:06:00 1.1
+++ pkgsrc/textproc/xapian-omega/patches/Attic/patch-ad 2009/04/20 22:25:38 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.1 2008/07/27 04:06:00 schmonz Exp $ 1$NetBSD: patch-ad,v 1.2 2009/04/20 22:25:38 schmonz Exp $
2 2
3--- configure.ac.orig 2008-07-16 00:42:17.000000000 -0400 3--- configure.ac.orig 2009-04-19 08:28:01.000000000 -0400
4+++ configure.ac 4+++ configure.ac
5@@ -108,6 +108,18 @@ dnl omindex uses fork(), socketpair(), a 5@@ -110,6 +110,18 @@ dnl omindex uses fork(), socketpair(), a
6 dnl limits on filter programs. 6 dnl limits on filter programs.
7 AC_CHECK_FUNCS([mmap fork setrlimit socketpair sysmp pstat_getdynamic]) 7 AC_CHECK_FUNCS([mmap fork setrlimit socketpair sysmp pstat_getdynamic])
8  8
9+dnl * Do we have RLIMIT_AS? 9+dnl * Do we have RLIMIT_AS?
10+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 10+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
11+ #include <sys/types.h> 11+ #include <sys/types.h>
12+ #include <sys/time.h> 12+ #include <sys/time.h>
13+ #include <sys/resource.h> 13+ #include <sys/resource.h>
14+]], [[ 14+]], [[
15+ struct rlimit r; 15+ struct rlimit r;
16+ getrlimit(RLIMIT_AS, &r); 16+ getrlimit(RLIMIT_AS, &r);
17+]])],[ 17+]])],[
18+ AC_DEFINE(HAVE_RLIMIT_AS,, Define if you have RLIMIT_AS for setrlimit()) 18+ AC_DEFINE(HAVE_RLIMIT_AS,, Define if you have RLIMIT_AS for setrlimit())
cvs diff -r1.1 -r1.2 pkgsrc/textproc/xapian-omega/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/textproc/xapian-omega/patches/Attic/patch-ae 2008/07/27 04:06:00 1.1
+++ pkgsrc/textproc/xapian-omega/patches/Attic/patch-ae 2009/04/20 22:25:38 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ae,v 1.1 2008/07/27 04:06:00 schmonz Exp $ 1$NetBSD: patch-ae,v 1.2 2009/04/20 22:25:38 schmonz Exp $
2 2
3--- configure.orig 2008-07-26 23:26:32.000000000 -0400 3--- configure.orig 2009-04-19 08:33:22.000000000 -0400
4+++ configure 4+++ configure
5@@ -15850,6 +15850,62 @@ fi 5@@ -15846,6 +15846,62 @@ fi
6 done 6 done
7  7
8  8
9+cat >conftest.$ac_ext <<_ACEOF 9+cat >conftest.$ac_ext <<_ACEOF
10+/* confdefs.h. */ 10+/* confdefs.h. */
11+_ACEOF 11+_ACEOF
12+cat confdefs.h >>conftest.$ac_ext 12+cat confdefs.h >>conftest.$ac_ext
13+cat >>conftest.$ac_ext <<_ACEOF 13+cat >>conftest.$ac_ext <<_ACEOF
14+/* end confdefs.h. */ 14+/* end confdefs.h. */
15+ 15+
16+ #include <sys/types.h> 16+ #include <sys/types.h>
17+ #include <sys/time.h> 17+ #include <sys/time.h>
18+ #include <sys/resource.h> 18+ #include <sys/resource.h>
@@ -55,22 +55,22 @@ $NetBSD: patch-ae,v 1.1 2008/07/27 04:06 @@ -55,22 +55,22 @@ $NetBSD: patch-ae,v 1.1 2008/07/27 04:06
55+ 55+
56+else 56+else
57+ $as_echo "$as_me: failed program was:" >&5 57+ $as_echo "$as_me: failed program was:" >&5
58+sed 's/^/| /' conftest.$ac_ext >&5 58+sed 's/^/| /' conftest.$ac_ext >&5
59+ 59+
60+ 60+
61+fi 61+fi
62+ 62+
63+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 63+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
64+ 64+
65 { $as_echo "$as_me:$LINENO: checking for working ISO C90 conforming snprintf" >&5 65 { $as_echo "$as_me:$LINENO: checking for working ISO C90 conforming snprintf" >&5
66 $as_echo_n "checking for working ISO C90 conforming snprintf... " >&6; } 66 $as_echo_n "checking for working ISO C90 conforming snprintf... " >&6; }
67 ac_cv_func_snprintf_noniso=no 67 ac_cv_func_snprintf_noniso=no
68@@ -17492,6 +17548,8 @@ do 68@@ -17514,6 +17570,8 @@ do
69 case $ac_option in 69 case $ac_option in
70 # Handling of the options. 70 # Handling of the options.
71 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 71 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
72+ : Avoid regenerating within pkgsrc 72+ : Avoid regenerating within pkgsrc
73+ exit 0 73+ exit 0
74 ac_cs_recheck=: ;; 74 ac_cs_recheck=: ;;
75 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 75 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
76 $as_echo "$ac_cs_version"; exit ;; 76 $as_echo "$ac_cs_version"; exit ;;
File Deleted: pkgsrc/textproc/xapian-omega/patches/Attic/patch-af