Attachment #219535 for bug #250944




# $FreeBSD$

PORTNAME=	fts-xapian
PORTVERSION=	1.4.3
CATEGORIES=	mail
PKGNAMEPREFIX=	dovecot-

MAINTAINER=	juraj@lutter.sk
COMMENT=	Dovecot FTS plugin based on Xapian

LICENSE=	LGPL21

BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
LIB_DEPENDS=	libxapian.so:databases/xapian-core \
		libicuuc.so:devel/icu
		libsqlite3.so:databases/sqlite3
RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot

USES=		autoreconf compiler:c++11-lang libtool pkgconfig

USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	grosjo

GNU_CONFIGURE=	yes

PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
		lib/dovecot/lib21_fts_xapian_plugin.so

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/mail/dovecot-fts-xapian/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1604301654	1	TIMESTAMP = 1604831317
2	SHA256 (grosjo-fts-xapian-1.4.2_GH0.tar.gz) = 11ff20bd91d81754bbe4f9ad52cf1fd74be8c3bb8633a7023a35cf4cc3c18c58	2	SHA256 (grosjo-fts-xapian-1.4.3_GH0.tar.gz) = 5d7dcc73c2b5a22864e4a86450cd430d65a5141f9129415ea2630369d1c7a953
3	SIZE (grosjo-fts-xapian-1.4.2_GH0.tar.gz) = 27812	3	SIZE (grosjo-fts-xapian-1.4.3_GH0.tar.gz) = 28615




--- src/fts-backend-xapian.cpp.orig	2020-11-02 07:45:52 UTC
+++ src/fts-backend-xapian.cpp
@@ -11,8 +11,8 @@ extern "C" {
 
 #define XAPIAN_FILE_PREFIX "xapian-indexes"
 #define XAPIAN_TERM_SIZELIMIT 245
-#define XAPIAN_COMMIT_ENTRIES 1000000
-#define XAPIAN_COMMIT_TIMEOUT 300
+#define XAPIAN_COMMIT_ENTRIES 1000000L
+#define XAPIAN_COMMIT_TIMEOUT 300L
 #define XAPIAN_COMMIT_MEMORY 10240
 #define XAPIAN_WILDCARD "wldcrd"
 #define XAPIAN_EXPUNGE_SIZE 3

Return to bug 250944

Lines 1-34 Link Here

(-)b/mail/dovecot-fts-xapian/Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= fts-xapian	3	PORTNAME= fts-xapian
4	PORTVERSION= 1.4.2	4	PORTVERSION= 1.4.3
5	CATEGORIES= mail	5	CATEGORIES= mail
6	PKGNAMEPREFIX= dovecot-	6	PKGNAMEPREFIX= dovecot-
7		7
8	MAINTAINER= juraj@lutter.sk	8	MAINTAINER= juraj@lutter.sk
9	COMMENT= Dovecot FTS plugin based on Xapian	9	COMMENT= Dovecot FTS plugin based on Xapian
10		10
11	LICENSE= LGPL21	11	LICENSE= LGPL21
12		12
13	BUILD_DEPENDS= dovecot>=2.3.7:mail/dovecot	13	BUILD_DEPENDS= dovecot>=2.3.7:mail/dovecot
14	LIB_DEPENDS= libxapian.so:databases/xapian-core \	14	LIB_DEPENDS= libxapian.so:databases/xapian-core \
15	libicuuc.so:devel/icu \	15	libicuuc.so:devel/icu
16	libsqlite3.so:databases/sqlite3
17	RUN_DEPENDS= dovecot>=2.3.7:mail/dovecot	16	RUN_DEPENDS= dovecot>=2.3.7:mail/dovecot
18		17
19	USES= autoreconf compiler:c++11-lang libtool pkgconfig	18	USES= autoreconf compiler:c++11-lang libtool pkgconfig
20		19
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22		21
23	USE_GITHUB= yes	22	USE_GITHUB= yes
24	GH_ACCOUNT= grosjo	23	GH_ACCOUNT= grosjo
25		24
26	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
27		26
28	PLIST_FILES= lib/dovecot/lib21_fts_xapian_plugin.a \	27	PLIST_FILES= lib/dovecot/lib21_fts_xapian_plugin.a \
29	lib/dovecot/lib21_fts_xapian_plugin.so	28	lib/dovecot/lib21_fts_xapian_plugin.so
30		29
31	post-install:	30	post-install:
32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so	31	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
33		32
34	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Removed Link Here

(-)a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp (-13 lines)
1	--- src/fts-backend-xapian.cpp.orig 2020-11-02 07:45:52 UTC
2	+++ src/fts-backend-xapian.cpp
3	@@ -11,8 +11,8 @@ extern "C" {
4
5	#define XAPIAN_FILE_PREFIX "xapian-indexes"
6	#define XAPIAN_TERM_SIZELIMIT 245
7	-#define XAPIAN_COMMIT_ENTRIES 1000000
8	-#define XAPIAN_COMMIT_TIMEOUT 300
9	+#define XAPIAN_COMMIT_ENTRIES 1000000L
10	+#define XAPIAN_COMMIT_TIMEOUT 300L
11	#define XAPIAN_COMMIT_MEMORY 10240
12	#define XAPIAN_WILDCARD "wldcrd"
13	#define XAPIAN_EXPUNGE_SIZE 3