From john.marshall@riverwillow.com.au  Thu Jun 28 08:50:21 2012
Return-Path: <john.marshall@riverwillow.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1AAD1065694
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jun 2012 08:50:21 +0000 (UTC)
	(envelope-from john.marshall@riverwillow.com.au)
Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B28D8FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jun 2012 08:50:20 +0000 (UTC)
Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201])
	(authenticated bits=0)
	by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q5S8oE94012460
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jun 2012 18:50:14 +1000 (AEST)
Received: from rwpc15.mby.riverwillow.net.au (john@localhost [127.0.0.1])
	by rwpc15.mby.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q5S8oEis026010
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jun 2012 18:50:14 +1000 (AEST)
	(envelope-from john.marshall@riverwillow.com.au)
Received: (from john@localhost)
	by rwpc15.mby.riverwillow.net.au (8.14.5/8.14.5/Submit) id q5S8oEiF026009;
	Thu, 28 Jun 2012 18:50:14 +1000 (AEST)
	(envelope-from john)
Message-Id: <201206280850.q5S8oEiF026009@rwpc15.mby.riverwillow.net.au>
Date: Thu, 28 Jun 2012 18:50:14 +1000 (AEST)
From: John Marshall <john.marshall@riverwillow.com.au>
Reply-To: John Marshall <john.marshall@riverwillow.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] misc/sword Add module indexing capability option
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         169510
>Category:       ports
>Synopsis:       [PATCH] misc/sword Add module indexing capability option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 28 09:00:22 UTC 2012
>Closed-Date:    Sun Jul 01 03:46:16 UTC 2012
>Last-Modified:  Sun Jul  1 03:50:10 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 28 09:00:34 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169510 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Sun Jul 1 03:46:14 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169510 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169510: commit references a PR
Date: Sun,  1 Jul 2012 03:46:15 +0000 (UTC)

 tabthorpe    2012-07-01 03:46:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/sword           Makefile pkg-plist 
   Log:
   - Depend on clucene for indexing, turned on by default
   - Bump PORTREVISION
   
   PR:             ports/169510
   Submitted by:   John Marshall <john.marshall riverwillow.com.au>
   
   Revision  Changes    Path
   1.53      +15 -3     ports/misc/sword/Makefile
   1.14      +11 -0     ports/misc/sword/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
