ports/174459: textproc/clucene fails to build on CURRENT

[Schaich at FreeBSD.org]

>Number:         174459
>Category:       ports
>Synopsis:       textproc/clucene fails to build on CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 15 19:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Schaich, Alonso
>Release:        10.0-CURRENT
>Organization:
>Environment:
FreeBSD moonshine.localnet.edu 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r244240: Sat Dec 15 04:05:11 CET 2012     root at harmony.localnet.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
As in synopsis. This is due to try{}-scopes not allowing field name reusing in our clang version. Workaround is attached.
>How-To-Repeat:
portmaster textproc/clucene
>Fix:
extract tarball into $PORTSDIR/textproc/clucene 

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files
#	files/patch-src__CLucene__index__SegmentMerger.cpp
#	files/patch-src__CLucene__search__FieldCacheImpl.cpp
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-src__CLucene__index__SegmentMerger.cpp
sed 's/^X//' >files/patch-src__CLucene__index__SegmentMerger.cpp << 'ba25e3f7976d44c856047387f6b18be6'
X--- src/CLucene/index/SegmentMerger.cpp~	2008-08-22 14:40:25.000000000 +0000
X+++ src/CLucene/index/SegmentMerger.cpp	2012-12-15 18:35:31.000000000 +0000
X@@ -249,7 +249,7 @@
X     CND_CONDITION(fieldsWriter != NULL,"Memory allocation for fieldsWriter failed");
X 
X     try {  
X-        IndexReader* reader = NULL;
X+        reader = NULL;
X 		int32_t maxDoc          = 0;
X         //Iterate through all readers
X         for (uint32_t i = 0; i < readers.size(); i++) {
ba25e3f7976d44c856047387f6b18be6
echo x - files/patch-src__CLucene__search__FieldCacheImpl.cpp
sed 's/^X//' >files/patch-src__CLucene__search__FieldCacheImpl.cpp << '189b2135883401a5594ff822881e7dfc'
X--- src/CLucene/search/FieldCacheImpl.cpp~	2008-08-22 14:40:23.000000000 +0000
X+++ src/CLucene/search/FieldCacheImpl.cpp	2012-12-15 18:39:28.000000000 +0000
X@@ -414,7 +414,7 @@
X 	  _CLDECDELETE(term);
X 
X       try {
X-        Term* term = enumerator->term(false);
X+        term = enumerator->term(false);
X         if (term == NULL) {
X           _CLTHROWA(CL_ERR_Runtime,"no terms in field - cannot determine sort type"); //todo: make rich error: " + field + " 
X         }
189b2135883401a5594ff822881e7dfc
exit



>Release-Note:
>Audit-Trail:
>Unformatted: