From jhelfman@experts-exchange.com  Wed Mar 21 06:49:43 2012
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 60997106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Mar 2012 06:49:43 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.dw.redsrci.com (mail.pub.dw.redsrci.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 3ED0C8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Mar 2012 06:49:43 +0000 (UTC)
Received: from mail.dw.redsrci.com (localhost [127.0.0.1])
	by mail.dw.redsrci.com (Postfix) with ESMTP id EAF796F0EF6;
	Tue, 20 Mar 2012 23:49:36 -0700 (PDT)
Received: from mail.dw.redsrci.com ([127.0.0.1])
	by mail.dw.redsrci.com (mail.dw.redsrci.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 112y6YlqmehX; Tue, 20 Mar 2012 23:49:36 -0700 (PDT)
Received: from experts-exchange.com (unknown [192.168.103.120])
	by mail.dw.redsrci.com (Postfix) with SMTP id B49A96F0EF3;
	Tue, 20 Mar 2012 23:49:36 -0700 (PDT)
Received: (nullmailer pid 78048 invoked by uid 1001);
	Wed, 21 Mar 2012 06:48:46 -0000
Message-Id: <1332312526.749495.78047.nullmailer@experts-exchange.com>
Date: Tue, 20 Mar 2012 23:48:46 -0700
From: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gerrit.beine@gmx.de
Subject: [PATCH] textproc/lucene: update to 3.5.0, build from source
X-Send-Pr-Version: 3.113
X-GNATS-Notify: gerrit.beine@gmx.de

>Number:         166289
>Category:       ports
>Synopsis:       [PATCH] textproc/lucene: update to 3.5.0, build from source
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 21 06:50:13 UTC 2012
>Closed-Date:    Wed Apr 04 17:28:52 UTC 2012
>Last-Modified:  Wed Apr  4 17:30:11 UTC 2012
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
- Update to 3.5.0
- standardize MASTER_SITES
- move away from binary, and build from source distribution

Port maintainer (gerrit.beine@gmx.de) is cc'd.

Generated with FreeBSD Port Tools 0.99_4 (mode: update, diff: CVS)
>How-To-Repeat:
>Fix:

--- lucene-3.5.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/lucene/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	9 Jan 2012 15:41:04 -0000	1.11
+++ Makefile	21 Mar 2012 06:47:06 -0000
@@ -7,10 +7,11 @@
 # Please don't forget to bump the version in py-lucene if this changes!
 
 PORTNAME=	lucene
-PORTVERSION=	3.4.0
+PORTVERSION=	3.5.0
 CATEGORIES=	textproc java devel
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/java/$(PORTVERSION),}
-DISTNAME=	lucene-${PORTVERSION}
+MASTER_SITES=	APACHE
+MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
+DISTNAME=	lucene-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gerrit.beine@gmx.de
@@ -18,9 +19,10 @@
 
 LICENSE=	AL2
 
-NO_BUILD=	yes
 USE_JAVA=	yes
+USE_ANT=	yes
 JAVA_VERSION=	1.5+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS=	DOCS    "Install docs & examples" on \
 		CONTRIB "Install contribs" off
@@ -29,8 +31,8 @@
 
 .include <bsd.port.options.mk>
 
-CONTRIBS=	analyzers \
-		benchmark \
+CONTRIBS=	benchmark \
+		demo \
 		facet	\
 		grouping \
 		highlighter \
@@ -42,14 +44,17 @@
 		queries \
 		queryparser	\
 		remote	\
-		smartcn \
 		spatial \
 		spellchecker \
-		stempel \
 		xml-query-parser
 
+EXTRA_CONTRIBS_BUILD=	analyzers
+
+EXTRA_CONTRIBS_DIRS=	smartcn \
+		stempel
+
 .if defined(WITH_CONTRIB)
-.for f in ${CONTRIBS}
+.for f in ${EXTRA_CONTRIBS_BUILD} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
 PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
 .endif
@@ -65,29 +70,35 @@
 DEMODIR=	contrib/demo
 
 .if defined(WITH_CONTRIB)
-post-extract:
-	${MV} ${WRKSRC}/contrib/analyzers/common/* ${WRKSRC}/contrib/analyzers/
-	${RMDIR} ${WRKSRC}/contrib/analyzers/common
-	${MV} ${WRKSRC}/contrib/analyzers/smartcn/ ${WRKSRC}/contrib/
-	${MV} ${WRKSRC}/contrib/analyzers/stempel/ ${WRKSRC}/contrib/
+post-build:
+.for i in ${EXTRA_CONTRIBS_BUILD} ${CONTRIBS}
+	cd ${WRKSRC}/contrib/${i} && ${ANT}
+.endfor
 .endif
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar \
-		${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-core-${PORTVERSION:R}-SNAPSHOT.jar \
+		${JAVAJARDIR}/${PORTNAME}-core-${PORTVERSION}.jar
 .if defined(WITH_CONTRIB)
 . for f in ${CONTRIBS}
 	@${INSTALL_DATA} \
-	    ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar \
-	    ${JAVAJARDIR}
+	    ${WRKSRC}/build/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION:R}-SNAPSHOT.jar \
+	    ${JAVAJARDIR}/${PORTNAME}-${f}-${PORTVERSION}.jar
 . endfor
+. for d in ${EXTRA_CONTRIBS_DIRS}
+	@${INSTALL_DATA} \
+	    ${WRKSRC}/build/contrib/${EXTRA_CONTRIBS_BUILD}/${d}/${PORTNAME}-${d}-${PORTVERSION:R}-SNAPSHOT.jar \
+	    ${JAVAJARDIR}/${PORTNAME}-${d}-${PORTVERSION}.jar
+. endfor
+	@${INSTALL_DATA} \
+	    ${WRKSRC}/build/contrib/${EXTRA_CONTRIBS_BUILD}/common/${PORTNAME}-${EXTRA_CONTRIBS_BUILD}-${PORTVERSION:R}-SNAPSHOT.jar \
+	    ${JAVAJARDIR}/${PORTNAME}-${EXTRA_CONTRIBS_BUILD}-${PORTVERSION}.jar
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/NOTICE.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+.for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
 	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 .if !defined(NOPORTEXAMPLES)
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/textproc/lucene/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	13 Nov 2011 17:43:52 -0000	1.7
+++ distinfo	21 Mar 2012 06:47:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (lucene-3.4.0.tgz) = 56fa8afd3b9cbce1b990aa10dd9af30aef434a06506f08814fb6b8c7c526af57
-SIZE (lucene-3.4.0.tgz) = 42933801
+SHA256 (lucene-3.5.0-src.tgz) = 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27
+SIZE (lucene-3.5.0-src.tgz) = 39564076
--- lucene-3.5.0.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Mar 21 06:50:29 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166289 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Mar 21 06:50:34 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gerrit.beine@gmx.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/166289: [PATCH] textproc/lucene: update to 3.5.0, build from source
Date: Wed, 21 Mar 2012 06:50:32 UT

 Maintainer of textproc/lucene,
 
 Please note that PR ports/166289 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/166289
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: jgh 
State-Changed-When: Wed Apr 4 17:28:39 UTC 2012 
State-Changed-Why:  
maintainer timeout ( 15 days ) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166289 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Wed Apr 4 17:28:51 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166289: commit references a PR
Date: Wed,  4 Apr 2012 17:24:18 +0000 (UTC)

 jgh         2012-04-04 17:24:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/lucene      Makefile distinfo 
   Log:
   - Update to 3.5.0
   - standardize MASTER_SITES
   - move away from binary, and build from source distribution
   
   PR:     ports/166289
   Submitted by:   jgh (me)
   Approved by:    maintainer timeout ( 15 days )
   Feature safe:   yes
   
   Revision  Changes    Path
   1.12      +33 -22    ports/textproc/lucene/Makefile
   1.8       +2 -2      ports/textproc/lucene/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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166289: commit references a PR
Date: Wed,  4 Apr 2012 17:27:42 +0000 (UTC)

 jgh         2012-04-04 17:27:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/py-lucene   Makefile 
   Log:
   - follow textproc/lucene update (3.5.0)
   - bump PORTREVISION
   
   PR:     ports/166289
   Submitted by:   jgh (me)
   Approved by:    maintainer, clsung ( implicit)
   Feature safe:   yes
   
   Revision  Changes    Path
   1.30      +2 -2      ports/textproc/py-lucene/Makefile
 _______________________________________________
 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:
