diff options
| -rw-r--r-- | textproc/xapian-omega/Makefile | 8 | ||||
| -rw-r--r-- | textproc/xapian-omega/distinfo | 15 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-ac | 6 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-ad | 6 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-ae | 8 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-af | 14 |
6 files changed, 22 insertions, 35 deletions
diff --git a/textproc/xapian-omega/Makefile b/textproc/xapian-omega/Makefile index 36bf2ea39c5..ffcc51fb366 100644 --- a/textproc/xapian-omega/Makefile +++ b/textproc/xapian-omega/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2009/01/07 22:40:14 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2009/04/20 22:25:38 schmonz Exp $ # -DISTNAME= xapian-omega-1.0.10 +DISTNAME= xapian-omega-1.0.12 CATEGORIES= textproc -MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.10/ +MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.12/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://xapian.org/docs/omega/overview.html @@ -15,6 +15,8 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= perl:run +TEST_TARGET= check + REPLACE_PERL= dbi2omega htdig2omega mbox2omega SUBST_CLASSES+= files diff --git a/textproc/xapian-omega/distinfo b/textproc/xapian-omega/distinfo index c32945f6d28..3d419878422 100644 --- a/textproc/xapian-omega/distinfo +++ b/textproc/xapian-omega/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.3 2009/01/07 22:40:14 wiz Exp $ +$NetBSD: distinfo,v 1.4 2009/04/20 22:25:38 schmonz Exp $ -SHA1 (xapian-omega-1.0.10.tar.gz) = 135a948efa841ca968ff676b855e834a5e9f6cd8 -RMD160 (xapian-omega-1.0.10.tar.gz) = fd7a3db0b2691b7c32b34b45ecd0e2cb413eccc5 -Size (xapian-omega-1.0.10.tar.gz) = 501840 bytes +SHA1 (xapian-omega-1.0.12.tar.gz) = c55216e54ac07e6a1f03ef6d3db9945ca76e8bad +RMD160 (xapian-omega-1.0.12.tar.gz) = ea3e31eb49656a6640d9330e396eafa8593cf835 +Size (xapian-omega-1.0.12.tar.gz) = 506229 bytes SHA1 (patch-aa) = ce457e51d62ecc8833b1f1f7b9aaeddf6f39bf98 SHA1 (patch-ab) = 6e845f6a61d7e36715b4a1bde217ff31ea0999e5 -SHA1 (patch-ac) = e8c47ba1e3853f54d8fffc90d55318b7d3c2047f -SHA1 (patch-ad) = 1aa0b8d7a3a78d96edd087669ff46b76d1420a19 -SHA1 (patch-ae) = 1ebbce6ca463f12575baafef3a1acd3c2640bb5b -SHA1 (patch-af) = 4091131fc560c2491a613ddce11eba044adbac6c +SHA1 (patch-ac) = 49dc336eefdd1bafd8343e60ad01412127753989 +SHA1 (patch-ad) = 4a09fdb782f11cb94040cd892dcd0b92bd8d1785 +SHA1 (patch-ae) = a3a82ee093da5b3338622f8bb3e93308f147da98 diff --git a/textproc/xapian-omega/patches/patch-ac b/textproc/xapian-omega/patches/patch-ac index 076d7210b62..b6665effeef 100644 --- a/textproc/xapian-omega/patches/patch-ac +++ b/textproc/xapian-omega/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2008/07/27 04:06:00 schmonz Exp $ +$NetBSD: patch-ac,v 1.2 2009/04/20 22:25:38 schmonz Exp $ ---- config.h.in.orig 2008-07-16 00:46:58.000000000 -0400 +--- config.h.in.orig 2009-04-19 08:33:24.000000000 -0400 +++ config.h.in -@@ -45,6 +45,9 @@ +@@ -48,6 +48,9 @@ /* Define to 1 if you have the `pstat_getdynamic' function. */ #undef HAVE_PSTAT_GETDYNAMIC diff --git a/textproc/xapian-omega/patches/patch-ad b/textproc/xapian-omega/patches/patch-ad index 8665517cb17..d3e55f6ca40 100644 --- a/textproc/xapian-omega/patches/patch-ad +++ b/textproc/xapian-omega/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2008/07/27 04:06:00 schmonz Exp $ +$NetBSD: patch-ad,v 1.2 2009/04/20 22:25:38 schmonz Exp $ ---- configure.ac.orig 2008-07-16 00:42:17.000000000 -0400 +--- configure.ac.orig 2009-04-19 08:28:01.000000000 -0400 +++ configure.ac -@@ -108,6 +108,18 @@ dnl omindex uses fork(), socketpair(), a +@@ -110,6 +110,18 @@ dnl omindex uses fork(), socketpair(), a dnl limits on filter programs. AC_CHECK_FUNCS([mmap fork setrlimit socketpair sysmp pstat_getdynamic]) diff --git a/textproc/xapian-omega/patches/patch-ae b/textproc/xapian-omega/patches/patch-ae index c9bcc35561c..c15ea0d96b3 100644 --- a/textproc/xapian-omega/patches/patch-ae +++ b/textproc/xapian-omega/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2008/07/27 04:06:00 schmonz Exp $ +$NetBSD: patch-ae,v 1.2 2009/04/20 22:25:38 schmonz Exp $ ---- configure.orig 2008-07-26 23:26:32.000000000 -0400 +--- configure.orig 2009-04-19 08:33:22.000000000 -0400 +++ configure -@@ -15850,6 +15850,62 @@ fi +@@ -15846,6 +15846,62 @@ fi done @@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.1 2008/07/27 04:06:00 schmonz Exp $ { $as_echo "$as_me:$LINENO: checking for working ISO C90 conforming snprintf" >&5 $as_echo_n "checking for working ISO C90 conforming snprintf... " >&6; } ac_cv_func_snprintf_noniso=no -@@ -17492,6 +17548,8 @@ do +@@ -17514,6 +17570,8 @@ do case $ac_option in # Handling of the options. -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) diff --git a/textproc/xapian-omega/patches/patch-af b/textproc/xapian-omega/patches/patch-af deleted file mode 100644 index 4a35065aa2d..00000000000 --- a/textproc/xapian-omega/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.2 2009/01/07 22:40:14 wiz Exp $ - ---- runfilter.cc.orig 2008-12-23 08:55:31.000000000 +0100 -+++ runfilter.cc -@@ -97,7 +98,9 @@ stdout_to_string(const string &cmd) - if (mem > 0) { - mem = (mem / 8) * 7; - struct rlimit ram_limit = { mem, RLIM_INFINITY } ; -+#ifdef HAVE_RLIMIT_AS - setrlimit(RLIMIT_AS, &ram_limit); -+#endif - } - - execl("/bin/sh", "/bin/sh", "-c", cmd.c_str(), (void*)NULL); |