View | Details | Raw Unified | Return to bug 205231 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +25 lines)
Lines 48-54 Link Here
48
48
49
OPTIONS_GROUP=		DB FTS
49
OPTIONS_GROUP=		DB FTS
50
OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
50
OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
51
OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
51
OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT CATDOC POPPER-UTILS XPDF
52
52
53
OPTIONS_SINGLE=		GSSAPI
53
OPTIONS_SINGLE=		GSSAPI
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
Lines 60-76 Link Here
60
DB_DESC=	Database support
60
DB_DESC=	Database support
61
CDB_DESC=	CDB database support
61
CDB_DESC=	CDB database support
62
62
63
FTS_DESC=	Full text search plugins
63
FTS_DESC=		Full text search plugins and options
64
ICU_DESC=	Use libicu for FTS unicode normalization
64
CATDOC_DESC=		Use catdoc for MS Office documents decoding for FTS
65
LUCENE_DESC=	CLucene FTS support
65
ICU_DESC=		Use libicu for FTS unicode normalization
66
SOLR_DESC=	Solr FTS support
66
LUCENE_DESC=		CLucene FTS support
67
TEXTCAT_DESC=	Libtextcat FTS support
67
SOLR_DESC=		Solr FTS support
68
TEXTCAT_DESC=		Libtextcat FTS support
69
POPPER-UTILS_DESC=	Use popper-utils for pdf to text conversion for FTS
70
XPDF_DESC=		Use xpdf for pdf to text conversion for FTS
68
71
69
GSSAPI_NONE_DESC=	Build without GSSAPI support
72
GSSAPI_NONE_DESC=	Build without GSSAPI support
70
GSSAPI_BASE_DESC=	Use GSSAPI from base
73
GSSAPI_BASE_DESC=	Use GSSAPI from base
71
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
74
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
72
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
75
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
73
76
77
CATDOC_RUN_DEPENDS=		catdoc:${PORTSDIR}/textproc/catdoc
78
74
CDB_CONFIGURE_WITH=	cdb
79
CDB_CONFIGURE_WITH=	cdb
75
CDB_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
80
CDB_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
76
81
Lines 105-110 Link Here
105
PGSQL_USES=		pgsql
110
PGSQL_USES=		pgsql
106
PGSQL_CONFIGURE_WITH=	pgsql
111
PGSQL_CONFIGURE_WITH=	pgsql
107
112
113
POPPER-UTILS_RUN_DEPENDS=	popper-utils:${PORTSDIR}/graphics/popper-utils
114
108
SOLR_CONFIGURE_WITH=	solr
115
SOLR_CONFIGURE_WITH=	solr
109
SOLR_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
116
SOLR_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
110
SOLR_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
117
SOLR_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
Lines 120-125 Link Here
120
VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail
127
VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail
121
VPOPMAIL_CONFIGURE_WITH=vpopmail
128
VPOPMAIL_CONFIGURE_WITH=vpopmail
122
129
130
XPDF_RUN_DEPENDS=		xpdf:${PORTSDIR}/graphics/xpdf/
131
XPDF_PREVENTS=		POPPER-UTILS
132
123
DOCS=		AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
133
DOCS=		AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
124
PORTDOCS=	*
134
PORTDOCS=	*
125
PORTEXAMPLES=	*
135
PORTEXAMPLES=	*
Lines 149-154 Link Here
149
	@${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \
159
	@${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \
150
		${WRKSRC}/doc/example-config/Makefile.in \
160
		${WRKSRC}/doc/example-config/Makefile.in \
151
		${WRKSRC}/doc/example-config/conf.d/Makefile.in
161
		${WRKSRC}/doc/example-config/conf.d/Makefile.in
162
.if ${PORT_OPTIONS:MXPDF}
163
		@${REINPLACE_CMD} -e 's|/usr/bin/pdftotext|${PREFIX}/lib/xpdf/pdftotext|g' ${WRKSRC}/src/plugins/fts/decode2text.sh
164
		@${REINPLACE_CMD} -e 's|/usr/bin/catdoc|${PREFIX}/bin/catdoc|g' ${WRKSRC}/src/plugins/fts/decode2text.sh
165
		@${REINPLACE_CMD} -e 's|/usr/bin/catppt|${PREFIX}/bin/catppt|g' ${WRKSRC}/src/plugins/fts/decode2text.sh
166
		@${REINPLACE_CMD} -e 's|/usr/bin/xls2csv|${PREFIX}/bin/xls2csv|g' ${WRKSRC}/src/plugins/fts/decode2text.sh
167
.else
168
		@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' ${WRKSRC}/src/plugins/fts/decode2text.sh
169
.endif
170
152
171
153
post-install:
172
post-install:
154
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
173
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}

Return to bug 205231