Date: Wed, 16 Jan 2013 14:46:33 +0800 (CST) From: Po-Chien Lin <linpc@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/175345: [PATCH] textproc/mifluz: update to 0.25.0, take maintainership Message-ID: <20130116064633.9AFFC3A706@dev.linpc.org> Resent-Message-ID: <201301160650.r0G6o1fp006116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175345
>Category: ports
>Synopsis: [PATCH] textproc/mifluz: update to 0.25.0, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 16 06:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Po-Chien Lin
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dev.linpc.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Sat Jan 5 22:32:49 CST
>Description:
- Update to 0.25.0
- Take maintainership
- Unify patch nameing
- Add LICENSE and USE_GCC knob
Added file(s):
- files/patch-clib-strcasestr2.c
- files/patch-db-db_int.h
- files/patch-mifluz-Makefile.in
- files/patch-search-WordResults.cc
Removed file(s):
- files/patch-clib__strscasestr2.c
- files/patch-db_db_int.h
- files/patch-mifluz::Makefile.in
- files/patch-mifluz_WordDBCache.h
- files/patch-search_WordResults.cc
>How-To-Repeat:
>Fix:
--- mifluz-0.25.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/Makefile ./Makefile
--- /usr/ports/textproc/mifluz/Makefile 2013-01-05 22:06:52.323138268 +0800
+++ ./Makefile 2013-01-16 14:42:16.993656923 +0800
@@ -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: head/textproc/mifluz/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
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
@@ -22,13 +21,13 @@
SUB_FILES= pkg-message
-MAN1= htdb_dump.1 htdb_stat.1 htdb_load.1 mifluz-config.1 \
- mifluzdump.1 mifluzload.1 mifluzsearch.1 mifluzdict.1
-MAN3= WordContext.3 WordList.3 WordDict.3 WordListOne.3 \
- WordKey.3 WordKeyInfo.3 WordType.3 WordDBInfo.3 \
- WordRecordInfo.3 WordRecord.3 WordReference.3 WordCursor.3 \
- WordCursorOne.3 WordMonitor.3 Configuration.3 mifluz.3
-INFO= mifluz
+MAN1= htdb_dump.1 htdb_stat.1 htdb_load.1 mifluz-config.1 \
+ mifluzdump.1 mifluzload.1 mifluzsearch.1 mifluzdict.1
+MAN3= WordContext.3 WordList.3 WordDict.3 WordListOne.3 \
+ WordKey.3 WordKeyInfo.3 WordType.3 WordDBInfo.3 \
+ WordRecordInfo.3 WordRecord.3 WordReference.3 WordCursor.3 \
+ WordCursorOne.3 WordMonitor.3 Configuration.3 mifluz.3
+INFO= mifluz
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/distinfo ./distinfo
--- /usr/ports/textproc/mifluz/distinfo 2013-01-05 22:06:52.323138268 +0800
+++ ./distinfo 2013-01-16 13:41:02.924495054 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/textproc/mifluz/files/patch-Makefile.in 2013-01-05 22:06:52.333913123 +0800
+++ ./files/patch-Makefile.in 2013-01-16 14:02:17.449633901 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-clib-strcasestr2.c ./files/patch-clib-strcasestr2.c
--- /usr/ports/textproc/mifluz/files/patch-clib-strcasestr2.c 1970-01-01 08:00:00.000000000 +0800
+++ ./files/patch-clib-strcasestr2.c 2013-01-16 13:51:28.293669856 +0800
@@ -0,0 +1,15 @@
+--- ./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 +33,4 @@
+ }
+ return 0;
+ }
++#endif /* HAVE_STRCASESTR */
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-clib__strscasestr2.c ./files/patch-clib__strscasestr2.c
--- /usr/ports/textproc/mifluz/files/patch-clib__strscasestr2.c 2013-01-05 22:06:52.333913123 +0800
+++ ./files/patch-clib__strscasestr2.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,16 +0,0 @@
---- 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 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
-
-+#ifndef HAVE_STRCASESTR
-+
- #include <ctype.h>
- #include <string.h>
-
-@@ -32,3 +34,4 @@
- }
- return 0;
- }
-+#endif /* HAVE_STRCASESTR */
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-db-db_int.h ./files/patch-db-db_int.h
--- /usr/ports/textproc/mifluz/files/patch-db-db_int.h 1970-01-01 08:00:00.000000000 +0800
+++ ./files/patch-db-db_int.h 2013-01-16 13:51:28.283658190 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-db_db_int.h ./files/patch-db_db_int.h
--- /usr/ports/textproc/mifluz/files/patch-db_db_int.h 2013-01-05 22:06:52.323138268 +0800
+++ ./files/patch-db_db_int.h 1970-01-01 08:00:00.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-mifluz-Makefile.in ./files/patch-mifluz-Makefile.in
--- /usr/ports/textproc/mifluz/files/patch-mifluz-Makefile.in 1970-01-01 08:00:00.000000000 +0800
+++ ./files/patch-mifluz-Makefile.in 2013-01-16 13:51:28.293669856 +0800
@@ -0,0 +1,11 @@
+--- ./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)
+-libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la
++libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la $(LIBICONV)
+ include_HEADERS = \
+ mifluz.h
+
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-mifluz::Makefile.in ./files/patch-mifluz::Makefile.in
--- /usr/ports/textproc/mifluz/files/patch-mifluz::Makefile.in 2013-01-05 22:06:52.333913123 +0800
+++ ./files/patch-mifluz::Makefile.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- 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 @@
- WordType.cc
-
- libmifluz_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
--libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la
-+libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la $(LIBICONV)
- include_HEADERS = \
- mifluz.h
-
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-mifluz_WordDBCache.h ./files/patch-mifluz_WordDBCache.h
--- /usr/ports/textproc/mifluz/files/patch-mifluz_WordDBCache.h 2013-01-05 22:06:52.333913123 +0800
+++ ./files/patch-mifluz_WordDBCache.h 1970-01-01 08:00:00.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-search-WordResults.cc ./files/patch-search-WordResults.cc
--- /usr/ports/textproc/mifluz/files/patch-search-WordResults.cc 1970-01-01 08:00:00.000000000 +0800
+++ ./files/patch-search-WordResults.cc 2013-01-16 13:51:28.283658190 +0800
@@ -0,0 +1,20 @@
+--- ./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(long i = 0; i < length; i++) {
+ if(a_values[i] != b_values[i]) {
+ return a_values[i] > b_values[i] ? 1 : -1;
+ }
+@@ -198,7 +198,7 @@
+ }
+
+ if((error = ranked->set_re_len(ranked, sizeof(WordKeyNum) * document_length)) != 0) {
+- fprintf(stderr, "WordResults::Open ranked->set_re_len(%d) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
++ fprintf(stderr, "WordResults::Open ranked->set_re_len(%lu) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
+ return NOTOK;
+ }
+
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/files/patch-search_WordResults.cc ./files/patch-search_WordResults.cc
--- /usr/ports/textproc/mifluz/files/patch-search_WordResults.cc 2013-01-05 22:06:52.323138268 +0800
+++ ./files/patch-search_WordResults.cc 1970-01-01 08:00:00.000000000 +0800
@@ -1,25 +0,0 @@
---- 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;
-
- 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++) {
- if(a_values[i] != b_values[i]) {
- return a_values[i] > b_values[i] ? 1 : -1;
- }
-@@ -198,7 +198,7 @@
- }
-
- if((error = ranked->set_re_len(ranked, sizeof(WordKeyNum) * document_length)) != 0) {
-- fprintf(stderr, "WordResults::Open ranked->set_re_len(%d) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
-+ fprintf(stderr, "WordResults::Open ranked->set_re_len(%lu) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
- return NOTOK;
- }
-
diff -ruN --exclude=CVS /usr/ports/textproc/mifluz/pkg-plist ./pkg-plist
--- /usr/ports/textproc/mifluz/pkg-plist 2013-01-05 22:06:52.323138268 +0800
+++ ./pkg-plist 2013-01-16 14:41:22.760534129 +0800
@@ -96,4 +96,5 @@
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
--- mifluz-0.25.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130116064633.9AFFC3A706>