Wed Jan 21 06:42:32 2009 UTC ()
Add xapian-flint-backend and xapian-quartz-backend options, allowing
rationalisation of backends (and also allows wiring the database to the older
database format if desired).

The "suggested options" select support for both formats, which is also the
status quo.


(dsainty)
diff -r1.3 -r1.4 pkgsrc/textproc/xapian/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/xapian/PLIST
cvs diff -r1.3 -r1.4 pkgsrc/textproc/xapian/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xapian/Makefile 2009/01/08 03:43:31 1.3
+++ pkgsrc/textproc/xapian/Makefile 2009/01/21 06:42:32 1.4
@@ -1,18 +1,40 @@ @@ -1,18 +1,40 @@
1# $NetBSD: Makefile,v 1.3 2009/01/08 03:43:31 dsainty Exp $ 1# $NetBSD: Makefile,v 1.4 2009/01/21 06:42:32 dsainty Exp $
2# 2#
3 3
4DISTNAME= xapian-core-1.0.10 4DISTNAME= xapian-core-1.0.10
5PKGNAME= ${DISTNAME:S/-core//} 5PKGNAME= ${DISTNAME:S/-core//}
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.10/ 7MASTER_SITES= http://oligarchy.co.uk/xapian/1.0.10/
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://xapian.org/ 10HOMEPAGE= http://xapian.org/
11COMMENT= Search engine based on Probabilistic Information Retrieval 11COMMENT= Search engine based on Probabilistic Information Retrieval
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
 17PKG_OPTIONS_VAR= PKG_OPTIONS.xapian
 18PKG_SUPPORTED_OPTIONS= xapian-flint-backend xapian-quartz-backend
 19PKG_SUGGESTED_OPTIONS= xapian-flint-backend xapian-quartz-backend
 20
 21.include "../../mk/bsd.options.mk"
 22
 23PLIST_VARS+= quartz
 24.if !empty(PKG_OPTIONS:Mxapian-quartz-backend)
 25CONFIGURE_ARGS+= --enable-backend-quartz
 26PLIST.quartz= yes
 27.else
 28CONFIGURE_ARGS+= --disable-backend-quartz
 29.endif
 30
 31PLIST_VARS+= flint
 32.if !empty(PKG_OPTIONS:Mxapian-flint-backend)
 33CONFIGURE_ARGS+= --enable-backend-flint
 34PLIST.flint= yes
 35.else
 36CONFIGURE_ARGS+= --disable-backend-flint
 37.endif
 38
17.include "../../devel/zlib/buildlink3.mk" 39.include "../../devel/zlib/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/xapian/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/xapian/PLIST 2008/07/26 23:35:05 1.1.1.1
+++ pkgsrc/textproc/xapian/PLIST 2009/01/21 06:42:32 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2008/07/26 23:35:05 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/01/21 06:42:32 dsainty Exp $
2bin/copydatabase 2bin/copydatabase
3bin/delve 3bin/delve
4bin/quartzcheck 4${PLIST.quartz}bin/quartzcheck
5bin/quartzcompact 5${PLIST.quartz}bin/quartzcompact
6bin/quartzdump 6${PLIST.quartz}bin/quartzdump
7bin/quest 7bin/quest
8bin/simpleexpand 8bin/simpleexpand
9bin/simpleindex 9bin/simpleindex
10bin/simplesearch 10bin/simplesearch
11bin/xapian-check 11${PLIST.flint}bin/xapian-check
12bin/xapian-compact 12${PLIST.flint}bin/xapian-compact
13bin/xapian-config 13bin/xapian-config
14bin/xapian-inspect 14${PLIST.flint}bin/xapian-inspect
15bin/xapian-progsrv 15bin/xapian-progsrv
16bin/xapian-tcpsrv 16bin/xapian-tcpsrv
17include/xapian.h 17include/xapian.h
18include/xapian/base.h 18include/xapian/base.h
19include/xapian/database.h 19include/xapian/database.h
20include/xapian/dbfactory.h 20include/xapian/dbfactory.h
21include/xapian/deprecated.h 21include/xapian/deprecated.h
22include/xapian/document.h 22include/xapian/document.h
23include/xapian/enquire.h 23include/xapian/enquire.h
24include/xapian/error.h 24include/xapian/error.h
25include/xapian/errorhandler.h 25include/xapian/errorhandler.h
26include/xapian/expanddecider.h 26include/xapian/expanddecider.h
27include/xapian/positioniterator.h 27include/xapian/positioniterator.h
@@ -30,34 +30,34 @@ include/xapian/query.h @@ -30,34 +30,34 @@ include/xapian/query.h
30include/xapian/queryparser.h 30include/xapian/queryparser.h
31include/xapian/sorter.h 31include/xapian/sorter.h
32include/xapian/stem.h 32include/xapian/stem.h
33include/xapian/termgenerator.h 33include/xapian/termgenerator.h
34include/xapian/termiterator.h 34include/xapian/termiterator.h
35include/xapian/types.h 35include/xapian/types.h
36include/xapian/unicode.h 36include/xapian/unicode.h
37include/xapian/valueiterator.h 37include/xapian/valueiterator.h
38include/xapian/version.h 38include/xapian/version.h
39include/xapian/visibility.h 39include/xapian/visibility.h
40lib/libxapian.la 40lib/libxapian.la
41man/man1/copydatabase.1 41man/man1/copydatabase.1
42man/man1/delve.1 42man/man1/delve.1
43man/man1/quartzcheck.1 43${PLIST.quartz}man/man1/quartzcheck.1
44man/man1/quartzcompact.1 44${PLIST.quartz}man/man1/quartzcompact.1
45man/man1/quartzdump.1 45${PLIST.quartz}man/man1/quartzdump.1
46man/man1/quest.1 46man/man1/quest.1
47man/man1/xapian-check.1 47${PLIST.flint}man/man1/xapian-check.1
48man/man1/xapian-compact.1 48${PLIST.flint}man/man1/xapian-compact.1
49man/man1/xapian-config.1 49man/man1/xapian-config.1
50man/man1/xapian-inspect.1 50${PLIST.flint}man/man1/xapian-inspect.1
51man/man1/xapian-progsrv.1 51man/man1/xapian-progsrv.1
52man/man1/xapian-tcpsrv.1 52man/man1/xapian-tcpsrv.1
53share/aclocal/xapian.m4 53share/aclocal/xapian.m4
54share/doc/xapian-core/admin_notes.html 54share/doc/xapian-core/admin_notes.html
55share/doc/xapian-core/apidoc.pdf 55share/doc/xapian-core/apidoc.pdf
56share/doc/xapian-core/apidoc/html/annotated.html 56share/doc/xapian-core/apidoc/html/annotated.html
57share/doc/xapian-core/apidoc/html/base_8h-source.html 57share/doc/xapian-core/apidoc/html/base_8h-source.html
58share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight-members.html 58share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight-members.html
59share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight.html 59share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight.html
60share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__coll__graph.png 60share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__coll__graph.png
61share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png 61share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
62share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight-members.html 62share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight-members.html
63share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight.html 63share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight.html