Date: Thu, 28 Jun 2012 18:50:14 +1000 (AEST) From: John Marshall <john.marshall@riverwillow.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/169510: [PATCH] misc/sword Add module indexing capability option Message-ID: <201206280850.q5S8oEiF026009@rwpc15.mby.riverwillow.net.au> Resent-Message-ID: <201206280900.q5S90Mns025855@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169510 >Category: ports >Synopsis: [PATCH] misc/sword Add module indexing capability option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 28 09:00:22 UTC 2012 >Closed-Date: >Last-Modified: >Originator: John Marshall >Release: FreeBSD 9.0-RELEASE-p3 i386 >Organization: Riverwillow Pty Ltd >Environment: System: FreeBSD rwpc15 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Wed Jun 13 08:38:32 AEST 2012 root@rwpc15:/usr/obj/build/src/sys/RWPC15 i386 >Description: If sword is not linked with clucene it is not possible to index sword modules from a calling application like misc/xiphos. Sword module indexing attempts from within Xiphos result in an 'Indexing Failed' message. The patch below adds an indexing option knob to the port's Makefile which will build sword --with-clucene and --with-icu. When sword has been built like that, and then Xiphos is rebuilt, Xiphos is much more functional. >How-To-Repeat: >Fix: --- sword_1.6.2.diff begins here --- --- Makefile.orig 2012-06-10 11:27:14.000000000 +1000 +++ Makefile 2012-06-23 17:16:26.000000000 +1000 @@ -7,6 +7,7 @@ PORTNAME= sword PORTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \ http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \ @@ -26,14 +27,15 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoconf -CONFIGURE_ARGS+= --without-conf --without-clucene --with-zlib --without-icu +CONFIGURE_ARGS+= --without-conf --with-zlib USE_LDCONFIG= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_SUB= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= CURL +OPTIONS_DEFINE= CURL CLUCENE +CLUCENE_DESC= Include indexing capability OPTIONS_DEFAULT=CURL .include <bsd.port.options.mk> @@ -45,6 +47,14 @@ CONFIGURE_ARGS+= --without-curl .endif +.if ${PORT_OPTIONS:MCLUCENE} +LIB_DEPENDS+= clucene:${PORTSDIR}/textproc/clucene \ + icudata:${PORTSDIR}/devel/icu +CONFIGURE_ARGS+= --with-clucene --with-icu +.else +CONFIGURE_ARGS+= --without-clucene --without-icu +.endif + run-autotools:: run-autotools-aclocal post-patch: --- sword_1.6.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206280850.q5S8oEiF026009>