diff options
| -rw-r--r-- | textproc/mifluz/Makefile | 13 | ||||
| -rw-r--r-- | textproc/mifluz/distinfo | 4 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-Makefile.in | 7 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-clib-strcasestr2.c (renamed from textproc/mifluz/files/patch-clib__strscasestr2.c) | 9 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-db-db_int.h | 11 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-db_db_int.h | 15 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-mifluz-Makefile.in (renamed from textproc/mifluz/files/patch-mifluz::Makefile.in) | 6 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-mifluz_WordDBCache.h | 13 | ||||
| -rw-r--r-- | textproc/mifluz/files/patch-search-WordResults.cc (renamed from textproc/mifluz/files/patch-search_WordResults.cc) | 13 | ||||
| -rw-r--r-- | textproc/mifluz/pkg-plist | 3 |
10 files changed, 35 insertions, 59 deletions
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index 4a210aba97ff..56be224a32f1 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -1,18 +1,17 @@ -# New ports collection makefile for: GNU/mifluz -# Date created: 07 June 2002 -# Whom: Frederic Dubuy <fdubuy@free.fr> -# +# Created by: Frederic Dubuy <fdubuy@free.fr> # $FreeBSD$ -# PORTNAME= mifluz -PORTVERSION= 0.24.0 +PORTVERSION= 0.25.0 CATEGORIES= textproc MASTER_SITES= GNU -MAINTAINER= ports@FreeBSD.org +MAINTAINER= linpc@cs.nctu.edu.tw COMMENT= C++ library to build and query a full text inverted index +LICENSE= GPLv3 + +USE_GCC= any USE_GNOME= gnomehack USE_BISON= build USE_ICONV= yes diff --git a/textproc/mifluz/distinfo b/textproc/mifluz/distinfo index 7b76f5f071f7..80f16130d884 100644 --- a/textproc/mifluz/distinfo +++ b/textproc/mifluz/distinfo @@ -1,2 +1,2 @@ -SHA256 (mifluz-0.24.0.tar.gz) = 41d08773637af180ef3afb39ac2e24c0dd4f0d4f1e4aa736b0909ecf28680c3b -SIZE (mifluz-0.24.0.tar.gz) = 1556772 +SHA256 (mifluz-0.25.0.tar.gz) = b6f52648e259c41dc07df667cd7ebced4e0b7e3f8193a0efbc7414b98457524d +SIZE (mifluz-0.25.0.tar.gz) = 1632279 diff --git a/textproc/mifluz/files/patch-Makefile.in b/textproc/mifluz/files/patch-Makefile.in index b4c734476a66..f50b8c5c55c5 100644 --- a/textproc/mifluz/files/patch-Makefile.in +++ b/textproc/mifluz/files/patch-Makefile.in @@ -1,7 +1,6 @@ ---- Makefile.in.orig Fri Jun 7 11:23:57 2002 -+++ Makefile.in Fri Jun 7 11:24:43 2002 -@@ -469,7 +469,7 @@ - mkdir -p ${DESTDIR}${localstatedir}/cache/mifluz +--- ./Makefile.in.orig 2013-01-16 13:41:40.786389684 +0800 ++++ ./Makefile.in 2013-01-16 13:51:11.373721235 +0800 +@@ -957,6 +957,6 @@ @if [ ! -d ${DESTDIR}${sysconfdir} ] ; then mkdir -p ${DESTDIR}${sysconfdir} ; fi @if [ ! -f ${DESTDIR}${sysconfdir}/mifluz.conf ] ; \ - then a="cp ${srcdir}/mifluz.conf ${DESTDIR}${sysconfdir}/mifluz.conf" ; echo $$a ; $$a ; \ diff --git a/textproc/mifluz/files/patch-clib__strscasestr2.c b/textproc/mifluz/files/patch-clib-strcasestr2.c index 7053335bb0e1..921449169729 100644 --- a/textproc/mifluz/files/patch-clib__strscasestr2.c +++ b/textproc/mifluz/files/patch-clib-strcasestr2.c @@ -1,15 +1,14 @@ ---- clib/strcasestr2.c.orig 2008-06-05 00:01:39.000000000 +0900 -+++ clib/strcasestr2.c 2008-07-11 22:26:07.000000000 +0900 -@@ -12,6 +12,8 @@ +--- ./clib/strcasestr2.c.orig 2013-01-16 13:42:43.213865659 +0800 ++++ ./clib/strcasestr2.c 2013-01-16 13:50:06.277425451 +0800 +@@ -12,6 +12,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#ifndef HAVE_STRCASESTR -+ #include <ctype.h> #include <string.h> -@@ -32,3 +34,4 @@ +@@ -32,3 +33,4 @@ } return 0; } diff --git a/textproc/mifluz/files/patch-db-db_int.h b/textproc/mifluz/files/patch-db-db_int.h new file mode 100644 index 000000000000..5df5bd529e27 --- /dev/null +++ b/textproc/mifluz/files/patch-db-db_int.h @@ -0,0 +1,11 @@ +--- ./db/db_int.h.orig 2013-01-16 13:43:03.627123979 +0800 ++++ ./db/db_int.h 2013-01-16 13:49:17.653734397 +0800 +@@ -108,7 +108,7 @@ + * an array. + */ + #undef SSZ +-#define SSZ(name, field) ((int)&(((name *)0)->field)) ++#define SSZ(name, field) ((size_t)&(((name *)0)->field)) + + #undef SSZA + #define SSZA(name, field) ((long)&(((name *)0)->field[0])) diff --git a/textproc/mifluz/files/patch-db_db_int.h b/textproc/mifluz/files/patch-db_db_int.h deleted file mode 100644 index 8cdb2d6699fe..000000000000 --- a/textproc/mifluz/files/patch-db_db_int.h +++ /dev/null @@ -1,15 +0,0 @@ ---- db/db_int.h.orig 2007-11-22 12:18:53.000000000 +0100 -+++ db/db_int.h 2007-11-22 12:24:32.000000000 +0100 -@@ -108,10 +108,10 @@ - * an array. - */ - #undef SSZ --#define SSZ(name, field) ((int)&(((name *)0)->field)) -+#define SSZ(name, field) ((size_t)&(((name *)0)->field)) - - #undef SSZA --#define SSZA(name, field) ((int)&(((name *)0)->field[0])) -+#define SSZA(name, field) ((size_t)&(((name *)0)->field[0])) - - /* - * Print an address as a u_long (a u_long is the largest type we can print diff --git a/textproc/mifluz/files/patch-mifluz::Makefile.in b/textproc/mifluz/files/patch-mifluz-Makefile.in index acfb9a9a1c7e..87d315133c7f 100644 --- a/textproc/mifluz/files/patch-mifluz::Makefile.in +++ b/textproc/mifluz/files/patch-mifluz-Makefile.in @@ -1,6 +1,6 @@ ---- mifluz/Makefile.in.orig 2008-07-11 21:45:32.000000000 +0900 -+++ mifluz/Makefile.in 2008-07-11 21:47:15.000000000 +0900 -@@ -300,7 +300,7 @@ +--- ./mifluz/Makefile.in.orig 2013-01-16 13:43:17.443734240 +0800 ++++ ./mifluz/Makefile.in 2013-01-16 13:47:04.575242382 +0800 +@@ -361,7 +361,7 @@ WordType.cc libmifluz_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION) diff --git a/textproc/mifluz/files/patch-mifluz_WordDBCache.h b/textproc/mifluz/files/patch-mifluz_WordDBCache.h deleted file mode 100644 index 003a663fc357..000000000000 --- a/textproc/mifluz/files/patch-mifluz_WordDBCache.h +++ /dev/null @@ -1,13 +0,0 @@ ---- mifluz/WordDBCache.h.orig 2007-11-22 12:12:34.000000000 +0100 -+++ mifluz/WordDBCache.h 2007-11-22 12:15:53.000000000 +0100 -@@ -149,8 +149,8 @@ - inline int Absolute() { - int i; - for(i = 0; i < entries_length; i++) { -- entries[i].key = pool + (int)(entries[i].key); -- entries[i].data = pool + (int)(entries[i].data); -+ entries[i].key = pool + (long)(entries[i].key); -+ entries[i].data = pool + (long)(entries[i].data); - } - return OK; - } diff --git a/textproc/mifluz/files/patch-search_WordResults.cc b/textproc/mifluz/files/patch-search-WordResults.cc index 327abfc3bc0d..7c122040b4a5 100644 --- a/textproc/mifluz/files/patch-search_WordResults.cc +++ b/textproc/mifluz/files/patch-search-WordResults.cc @@ -1,16 +1,11 @@ ---- search/WordResults.cc.orig 2007-11-22 12:37:28.000000000 +0100 -+++ search/WordResults.cc 2007-11-22 12:39:52.000000000 +0100 -@@ -25,11 +25,11 @@ - - static int wordResults_cmp(const DBT* a, const DBT* b) - { -- int length = (int)a->app_private; -+ size_t length = (size_t)a->app_private; +--- ./search/WordResults.cc.orig 2013-01-16 13:44:02.283818270 +0800 ++++ ./search/WordResults.cc 2013-01-16 13:45:27.643665365 +0800 +@@ -29,7 +29,7 @@ WordKeyNum* a_values = (WordKeyNum*)a->data; WordKeyNum* b_values = (WordKeyNum*)b->data; - for(int i = 0; i < length; i++) { -+ for(size_t i = 0; i < length; i++) { ++ for(long i = 0; i < length; i++) { if(a_values[i] != b_values[i]) { return a_values[i] > b_values[i] ? 1 : -1; } diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist index ad3262161248..423e9099feb3 100644 --- a/textproc/mifluz/pkg-plist +++ b/textproc/mifluz/pkg-plist @@ -96,4 +96,5 @@ lib/libmifluz.so lib/libmifluz.so.0 @dirrm include/mifluz @exec mkdir -p %D/var/cache/mifluz -@dirrmtry var/cache/mifluz +@dirrm var/cache/mifluz +@dirrm var/cache |