From nobody@FreeBSD.org  Tue Oct 19 14:35:55 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE7E1106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 19 Oct 2010 14:35:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id BCE008FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 19 Oct 2010 14:35:55 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o9JEZt84090424
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 19 Oct 2010 14:35:55 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o9JEZtGB090423;
	Tue, 19 Oct 2010 14:35:55 GMT
	(envelope-from nobody)
Message-Id: <201010191435.o9JEZtGB090423@www.freebsd.org>
Date: Tue, 19 Oct 2010 14:35:55 GMT
From: Lucius Windschuh <lwindschuh@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Unbreak databases/p5-Search-Xapian
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         151579
>Category:       ports
>Synopsis:       [patch] Unbreak databases/p5-Search-Xapian
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brix
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 19 14:40:08 UTC 2010
>Closed-Date:    Fri Oct 29 16:43:43 UTC 2010
>Last-Modified:  Fri Oct 29 16:43:43 UTC 2010
>Originator:     Lucius Windschuh
>Release:        9.0-CURRENT r213041
>Organization:
>Environment:
FreeBSD t400 9.0-CURRENT FreeBSD 9.0-CURRENT #6 r213567MP: Fri Oct  8 13:43:35 CEST 2010     root@t400:/usr/obj/usr/src/sys/CURRENT  i386
>Description:
Xapian removed the add_boolean_term() function, but the Search::Xapian plugin does not reflect this change. We should update Search::Xapian to a newer version, I suppose. But as a quick fix, we may inline the definition of add_boolean_term from http://xapian.org/docs/sourcedoc/html/include_2xapian_2document_8h-source.html .
This is what the attached patch does, effectively unbreaking the build.
>How-To-Repeat:

>Fix:
Put the attached file into files/

Patch attached with submission follows:

--- XS/Document.xs-orig	2010-10-19 16:20:44.000000000 +0200
+++ XS/Document.xs	2010-10-19 16:21:58.000000000 +0200
@@ -104,7 +104,7 @@
     string	tname
     CODE:
 	try {
-	    THIS->add_boolean_term(tname);
+	    THIS->add_term(tname, 0);
 	} catch (const Error &error) {
 	    croak("Exception: %s", error.get_msg().c_str());
 	}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Oct 19 14:40:14 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151579 
Responsible-Changed-From-To: perl->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Oct 19 19:52:44 UTC 2010 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151579 
Responsible-Changed-From-To: pgollucci->brix 
Responsible-Changed-By: brix 
Responsible-Changed-When: Fri Oct 29 16:15:43 UTC 2010 
Responsible-Changed-Why:  
I'll take it 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151579: commit references a PR
Date: Fri, 29 Oct 2010 16:30:17 +0000 (UTC)

 brix        2010-10-29 16:30:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/p5-Search-Xapian Makefile distinfo 
   Log:
   - Update to v1.0.22
   - Add LICENSE information
   - Unbreak, fixing [1]
   
   PR:             ports/151579
   Submitted by:   Lucius Windschuh <lwindschuh@gmail.com>
   Approved by:    erwin@ (on behalf of perl@) (maintainer)
   
   Revision  Changes    Path
   1.31      +5 -6      ports/databases/p5-Search-Xapian/Makefile
   1.24      +3 -3      ports/databases/p5-Search-Xapian/distinfo
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: brix 
State-Changed-When: Fri Oct 29 16:42:53 UTC 2010 
State-Changed-Why:  
Fixed. Thank your for reporting this issue. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151579 
>Unformatted:
