From nobody@FreeBSD.org  Mon Nov 15 20:49:05 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 C4BA71065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 15 Nov 2010 20:49:05 +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 990188FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 15 Nov 2010 20:49:05 +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 oAFKn5WL023652
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 15 Nov 2010 20:49:05 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id oAFKn5H9023651;
	Mon, 15 Nov 2010 20:49:05 GMT
	(envelope-from nobody)
Message-Id: <201011152049.oAFKn5H9023651@www.freebsd.org>
Date: Mon, 15 Nov 2010 20:49:05 GMT
From: Paul Mather <paul@gromit.dlib.vt.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: textproc/clucene-contrib fails to patch
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: tom@tomjudge.com

>Number:         152272
>Category:       ports
>Synopsis:       textproc/clucene-contrib fails to patch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    jpaetzel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 15 20:50:10 UTC 2010
>Closed-Date:    Mon Nov 15 23:52:58 UTC 2010
>Last-Modified:  Tue Nov 16 00:00:23 UTC 2010
>Originator:     Paul Mather
>Release:        FreeBSD/amd64 8.1-STABLE
>Organization:
Virginia Tech
>Environment:
FreeBSD developer.tower.lib.vt.edu 8.1-STABLE FreeBSD 8.1-STABLE #0: Fri Nov  5 10:58:18 EDT 2010     pmather@developer.tower.lib.vt.edu:/usr/obj/usr/src/sys/DEVELOPER  amd64

>Description:
Port textproc/clucene-contrib fails to build at the patch stage because of an absolute pathname in the patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp patch file:

developer# make
===>  License check disabled, port has not defined LICENSE
===>  Extracting for clucene-contrib-0.9.16a
=> SHA256 Checksum OK for clucene-contrib-0.9.16a.tar.bz2.
===>  Patching for clucene-contrib-0.9.16a
===>   Converting DOS text files to UNIX text files
===>  Applying FreeBSD patches for clucene-contrib-0.9.16a
File to patch: 
No file found--skip this patch? [n] y
2 out of 2 hunks ignored--saving rejects to /work/a/ports/textproc/clucene-contrib/work/clucene-contrib-0.9.16a/src/CLucene/analysis/cjk/CJKAnalyzer.cpp.rej
Can't create /work/a/ports/textproc/clucene-contrib/work/clucene-contrib-0.9.16a/src/CLucene/analysis/cjk/CJKAnalyzer.cpp.rej, output is in /tmp//patchr6TIXJM: No such file or directory
=> Patch patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp failed to apply cleanly.
=> Patch(es) patch-Makefile.in patch-src_CLucene_analysis_Makefile.am applied cleanly.
*** Error code 1

Stop in /usr/ports/textproc/clucene-contrib.
developer#
>How-To-Repeat:
cd /usr/ports/textproc/clucene-contrib
make
>Fix:
The problem is that the patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp patch is badly formed.  Here is a diff to correct the patch:


--- patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp.orig 2010-11-15 14:45:29.074649667 -0500
+++ patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp      2010-11-15 14:38:59.148331898 -0500
@@ -1,5 +1,5 @@
---- /work/a/ports/textproc/clucene-contrib/work/clucene-contrib-0.9.16a/src/CLucene/analysis/cjk/CJKAnalyzer.cpp.orig  2007-02-10 13:56:33.000000000 +0000
-+++ /work/a/ports/textproc/clucene-contrib/work/clucene-contrib-0.9.16a/src/CLucene/analysis/cjk/CJKAnalyzer.cpp       2010-06-22 07:00:25.000000000 +0000
+--- src/CLucene/analysis/cjk/CJKAnalyzer.cpp.orig      2007-02-10 13:56:33.000000000 +0000
++++ src/CLucene/analysis/cjk/CJKAnalyzer.cpp   2010-06-22 07:00:25.000000000 +0000
 @@ -1,4 +1,5 @@
  #include "CLucene/StdHeader.h"
 +#include "CLucene/analysis/Analyzers.h"


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Nov 15 20:50:34 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: tom@tomjudge.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/152272: textproc/clucene-contrib fails to patch
Date: Mon, 15 Nov 2010 20:50:31 UT

 Maintainer of textproc/clucene-contrib,
 
 Please note that PR ports/152272 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/152272
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Tom Judge <tom@tomjudge.com>
To: bug-followup@FreeBSD.org
Cc: Edwin Groothuis <edwin@FreeBSD.org>, paul@gromit.dlib.vt.edu
Subject: Re: ports/152272: textproc/clucene-contrib fails to patch
Date: Mon, 15 Nov 2010 15:25:25 -0600

 Hi Paul,
 
 This seems like the correct fix.
 
 I seem to have re-generated this patch file while in tinderbox using
 full paths when I converted the patches from Dos line endings to Unix ones.
 
 Test run with your patch:
 http://tinderbox.tomjudge.com/tb/logs/8.1-amd64/clucene-contrib-0.9.16a.log
 
 Thanks for the report.
 
 Tom
 
 -- 
 TJU13-ARIN
Responsible-Changed-From-To: freebsd-ports-bugs->jpaetzel 
Responsible-Changed-By: jpaetzel 
Responsible-Changed-When: Mon Nov 15 23:42:28 UTC 2010 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152272 
State-Changed-From-To: feedback->closed 
State-Changed-By: jpaetzel 
State-Changed-When: Mon Nov 15 23:52:34 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152272: commit references a PR
Date: Mon, 15 Nov 2010 23:52:21 +0000 (UTC)

 jpaetzel    2010-11-15 23:52:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/clucene-contrib/files 
                                    patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp 
   Log:
   Fix issue with patch not applying
   
   PR:     ports/152272
   Submitted by:   Paul Mather <paul@gromit.dlib.vt.edu>
   Approved by:    Tom Judge <tom@tomjudge.com> (maintainer)
   
   Revision  Changes    Path
   1.2       +2 -2      ports/textproc/clucene-contrib/files/patch-src_CLucene_analysis_cjk_CJKAnalyzer.cpp
 _______________________________________________
 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:
