From 789af218caf1ef81fc14e9c320fe3eeedf552481 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 1 Jan 2014 08:48:47 +0000 Subject: [PATCH] Update groonga to 3.1.1. Release 3.1.1 - 2013/12/29 -------------------------- Improvements ^^^^^^^^^^^^ * [deb] Refined Groonga packages for Debian policy. [groonga-dev,01930] [Suggested by Hideki Yamane] * [deb] Dropped Debian 6.0 (squeeze) support. * [deb] Dropped Ubuntu 10.04 (lucid) support. * Supported :doc:`/reference/functions/geo_in_rectangle` in the whole world. * Supported error report when failed to casting invalid value of geo point type. * Exported some macros which is used for accessing pseudo column names. [groonga-dev,1999] [Suggested by whombx] * [doc] Refined drilldown documentation. [Reported by @Yahppo] * Supported :doc:`/reference/functions/between` function which is used for filtering the column value in specific range. * [doc] Updated Travis CI envrinment information. [Patch by cosmo0920] * [rpm][fedora] Dropped Fedora 19. * [rpm][fedora] Supported Fedora 20. * [doc] Updated "Groonga" notation. [Patch by cosmo0920] [GitHub#122, #123, #124, #125, #125, #126, #127, #128, #129, #130, #131, #131, #132, #133, #134] Fixes ^^^^^ * [munin] Fixed the wrong port number which is specified for GQTP. * [geo_in_circle] Fixed a bug that if you specify "LONGITUDExLATITUDE" as the 3rd argument of :doc:`/reference/functions/geo_in_circle`, Groonga crashes. Thanks ^^^^^^ * Hideki Yamane * whombx * @Yappo * cosmo0920 --- textproc/groonga/Makefile | 20 +++++++---------- textproc/groonga/PLIST | 18 +++++---------- textproc/groonga/distinfo | 8 +++---- .../groonga/patches/patch-lib_Makefile.in | 22 ------------------- 4 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 textproc/groonga/patches/patch-lib_Makefile.in diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index d3f0db41537a7..720a28105940d 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2013/12/15 19:50:19 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2014/01/01 08:48:47 obache Exp $ # -DISTNAME= groonga-3.1.0 +DISTNAME= groonga-3.1.1 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ @@ -43,18 +43,14 @@ OWN_DIRS+= ${VARBASE}/log/${PKGBASE} CHECK_WRKREF_SKIP+= bin/groonga CHECK_INTERPRETER_SKIP+= share/groonga/examples/* -REPLACE_RUBY+= data/munin/groonga_cpu_time -REPLACE_RUBY+= data/munin/groonga_disk -REPLACE_RUBY+= data/munin/groonga_n_records -REPLACE_RUBY+= data/munin/groonga_query_performance -REPLACE_RUBY+= data/munin/groonga_status +REPLACE_RUBY+= data/munin/groonga_cpu_time_ +REPLACE_RUBY+= data/munin/groonga_disk_ +REPLACE_RUBY+= data/munin/groonga_n_records_ +REPLACE_RUBY+= data/munin/groonga_query_performance_ +REPLACE_RUBY+= data/munin/groonga_status_ +REPLACE_RUBY+= data/munin/groonga_throughput_ .include "../../lang/ruby/replace.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -MAKE_ENV+= CLANG_NO_OPT=-O0 -.endif - .include "../../devel/editline/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST index d040b66e4ca19..e81436ded86dd 100644 --- a/textproc/groonga/PLIST +++ b/textproc/groonga/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2013/12/04 14:01:15 obache Exp $ +@comment $NetBSD: PLIST,v 1.18 2014/01/01 08:48:47 obache Exp $ bin/groonga bin/groonga-benchmark bin/groonga-suggest-create-dataset @@ -112,9 +112,6 @@ share/doc/groonga/en/html/_sources/reference/commands/table_list.txt share/doc/groonga/en/html/_sources/reference/commands/table_remove.txt share/doc/groonga/en/html/_sources/reference/commands/tokenize.txt share/doc/groonga/en/html/_sources/reference/commands/truncate.txt -share/doc/groonga/en/html/_sources/reference/commands_not_implemented/add.txt -share/doc/groonga/en/html/_sources/reference/commands_not_implemented/get.txt -share/doc/groonga/en/html/_sources/reference/commands_not_implemented/set.txt share/doc/groonga/en/html/_sources/reference/executables.txt share/doc/groonga/en/html/_sources/reference/executables/grnslap.txt share/doc/groonga/en/html/_sources/reference/executables/groonga-benchmark.txt @@ -125,6 +122,7 @@ share/doc/groonga/en/html/_sources/reference/executables/groonga-suggest-httpd.t share/doc/groonga/en/html/_sources/reference/executables/groonga-suggest-learner.txt share/doc/groonga/en/html/_sources/reference/executables/groonga.txt share/doc/groonga/en/html/_sources/reference/function.txt +share/doc/groonga/en/html/_sources/reference/functions/between.txt share/doc/groonga/en/html/_sources/reference/functions/edit_distance.txt share/doc/groonga/en/html/_sources/reference/functions/geo_distance.txt share/doc/groonga/en/html/_sources/reference/functions/geo_in_circle.txt @@ -298,9 +296,6 @@ share/doc/groonga/en/html/reference/commands/table_list.html share/doc/groonga/en/html/reference/commands/table_remove.html share/doc/groonga/en/html/reference/commands/tokenize.html share/doc/groonga/en/html/reference/commands/truncate.html -share/doc/groonga/en/html/reference/commands_not_implemented/add.html -share/doc/groonga/en/html/reference/commands_not_implemented/get.html -share/doc/groonga/en/html/reference/commands_not_implemented/set.html share/doc/groonga/en/html/reference/executables.html share/doc/groonga/en/html/reference/executables/grnslap.html share/doc/groonga/en/html/reference/executables/groonga-benchmark.html @@ -311,6 +306,7 @@ share/doc/groonga/en/html/reference/executables/groonga-suggest-httpd.html share/doc/groonga/en/html/reference/executables/groonga-suggest-learner.html share/doc/groonga/en/html/reference/executables/groonga.html share/doc/groonga/en/html/reference/function.html +share/doc/groonga/en/html/reference/functions/between.html share/doc/groonga/en/html/reference/functions/edit_distance.html share/doc/groonga/en/html/reference/functions/geo_distance.html share/doc/groonga/en/html/reference/functions/geo_in_circle.html @@ -461,9 +457,6 @@ share/doc/groonga/ja/html/_sources/reference/commands/table_list.txt share/doc/groonga/ja/html/_sources/reference/commands/table_remove.txt share/doc/groonga/ja/html/_sources/reference/commands/tokenize.txt share/doc/groonga/ja/html/_sources/reference/commands/truncate.txt -share/doc/groonga/ja/html/_sources/reference/commands_not_implemented/add.txt -share/doc/groonga/ja/html/_sources/reference/commands_not_implemented/get.txt -share/doc/groonga/ja/html/_sources/reference/commands_not_implemented/set.txt share/doc/groonga/ja/html/_sources/reference/executables.txt share/doc/groonga/ja/html/_sources/reference/executables/grnslap.txt share/doc/groonga/ja/html/_sources/reference/executables/groonga-benchmark.txt @@ -474,6 +467,7 @@ share/doc/groonga/ja/html/_sources/reference/executables/groonga-suggest-httpd.t share/doc/groonga/ja/html/_sources/reference/executables/groonga-suggest-learner.txt share/doc/groonga/ja/html/_sources/reference/executables/groonga.txt share/doc/groonga/ja/html/_sources/reference/function.txt +share/doc/groonga/ja/html/_sources/reference/functions/between.txt share/doc/groonga/ja/html/_sources/reference/functions/edit_distance.txt share/doc/groonga/ja/html/_sources/reference/functions/geo_distance.txt share/doc/groonga/ja/html/_sources/reference/functions/geo_in_circle.txt @@ -647,9 +641,6 @@ share/doc/groonga/ja/html/reference/commands/table_list.html share/doc/groonga/ja/html/reference/commands/table_remove.html share/doc/groonga/ja/html/reference/commands/tokenize.html share/doc/groonga/ja/html/reference/commands/truncate.html -share/doc/groonga/ja/html/reference/commands_not_implemented/add.html -share/doc/groonga/ja/html/reference/commands_not_implemented/get.html -share/doc/groonga/ja/html/reference/commands_not_implemented/set.html share/doc/groonga/ja/html/reference/executables.html share/doc/groonga/ja/html/reference/executables/grnslap.html share/doc/groonga/ja/html/reference/executables/groonga-benchmark.html @@ -660,6 +651,7 @@ share/doc/groonga/ja/html/reference/executables/groonga-suggest-httpd.html share/doc/groonga/ja/html/reference/executables/groonga-suggest-learner.html share/doc/groonga/ja/html/reference/executables/groonga.html share/doc/groonga/ja/html/reference/function.html +share/doc/groonga/ja/html/reference/functions/between.html share/doc/groonga/ja/html/reference/functions/edit_distance.html share/doc/groonga/ja/html/reference/functions/geo_distance.html share/doc/groonga/ja/html/reference/functions/geo_in_circle.html diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo index a7e816d0a7977..28e47c6c47bbe 100644 --- a/textproc/groonga/distinfo +++ b/textproc/groonga/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2013/12/15 19:50:19 joerg Exp $ +$NetBSD: distinfo,v 1.19 2014/01/01 08:48:47 obache Exp $ -SHA1 (groonga-3.1.0.tar.gz) = 7d4ad3be8ade2b97ccf6790063b2b08d111daa59 -RMD160 (groonga-3.1.0.tar.gz) = 49adee9c12c06a5ca5d8da1c571696440a6d0615 -Size (groonga-3.1.0.tar.gz) = 11005661 bytes +SHA1 (groonga-3.1.1.tar.gz) = 94f008c2b598e9d1e98a4c7a8b6115cc65c7367d +RMD160 (groonga-3.1.1.tar.gz) = df1809383c1e8ba8a6d48c9128d71b9579075817 +Size (groonga-3.1.1.tar.gz) = 9793396 bytes SHA1 (patch-lib_Makefile.in) = 0c8b6cd27df67cfdd8389d519bda8119412c35a2 diff --git a/textproc/groonga/patches/patch-lib_Makefile.in b/textproc/groonga/patches/patch-lib_Makefile.in deleted file mode 100644 index 66932c7ba5329..0000000000000 --- a/textproc/groonga/patches/patch-lib_Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-lib_Makefile.in,v 1.1 2013/12/15 19:50:19 joerg Exp $ - ---- lib/Makefile.in.orig 2013-12-15 13:52:48.000000000 +0000 -+++ lib/Makefile.in -@@ -619,13 +619,15 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -+CFLAGS.expr.c= ${CLANG_NO_OPT} -+ - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< ${CFLAGS.$<} &&\ - @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< ${CFLAGS.$<} - - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\