svn commit: r310952 - in head/textproc: . lucene lucene4

[Jason Helfman]

Author: jgh
Date: Thu Jan 24 22:32:36 2013
New Revision: 310952
URL: http://svnweb.freebsd.org/changeset/ports/310952

Log:
  - introduce Lucene 4.x branch to ports
  - set CONFLICTS and LATEST_LINK accordingly

Added:
  head/textproc/lucene4/
     - copied from r310939, head/textproc/lucene/
Modified:
  head/textproc/Makefile
  head/textproc/lucene/Makefile
  head/textproc/lucene4/Makefile
  head/textproc/lucene4/distinfo
  head/textproc/lucene4/pkg-descr

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Thu Jan 24 22:11:04 2013	(r310951)
+++ head/textproc/Makefile	Thu Jan 24 22:32:36 2013	(r310952)
@@ -421,6 +421,7 @@
     SUBDIR += ltxml
     SUBDIR += luaexpat
     SUBDIR += lucene
+    SUBDIR += lucene4
     SUBDIR += lv-aspell
     SUBDIR += m17n-contrib
     SUBDIR += m17n-im-config

Modified: head/textproc/lucene/Makefile
==============================================================================
--- head/textproc/lucene/Makefile	Thu Jan 24 22:11:04 2013	(r310951)
+++ head/textproc/lucene/Makefile	Thu Jan 24 22:32:36 2013	(r310952)
@@ -13,6 +13,8 @@ COMMENT=	A full-text search engine for J
 
 LICENSE=	AL2
 
+CONFLICTS=	lucene4-[0-9].*
+
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.6+

Modified: head/textproc/lucene4/Makefile
==============================================================================
--- head/textproc/lucene/Makefile	Thu Jan 24 18:16:37 2013	(r310939)
+++ head/textproc/lucene4/Makefile	Thu Jan 24 22:32:36 2013	(r310952)
@@ -1,18 +1,20 @@
-# Created by: Gerrit Beine <gerrit.beine at gmx.de>
+# Created by: Jason Helfman <jgh at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lucene
-PORTVERSION=	3.6.1
+PORTVERSION=	4.1.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A full-text search engine for Java
+MAINTAINER=	mva at FreeBSD.org
+COMMENT=	Full-text search engine for Java, 4.x branch
 
 LICENSE=	AL2
 
+CONFLICTS=	lucene-[0-9].*
+
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.6+
@@ -22,60 +24,61 @@ CONTRIB_DESC=	Install contributed jars
 OPTIONS_DEFAULT=	CONTRIB
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
+PKGNAMESUFFIX:=	4
+LASTEST_LINK=	${PORTNAME}4
 
 .include <bsd.port.options.mk>
 
 CONTRIBS=	benchmark \
 		demo \
+		codecs \
 		facet	\
 		grouping \
 		highlighter \
-		icu \
-		instantiated \
-		join	\
+		join \
 		memory \
 		misc \
-		pruning \
 		queries \
-		queryparser	\
-		remote	\
+		queryparser \
+		sandbox \
 		spatial \
-		spellchecker \
-		xml-query-parser
-
-EXTRA_CONTRIBS_BASE=	analyzers
+		suggest
 
-EXTRA_CONTRIBS_DIRS=	kuromoji \
+EXTRA_CONTRIBS_DIRS=	common \
+		icu \
+		kuromoji \
+		morfologik \
 		phonetic \
 		smartcn \
-		stempel
+		stempel \
+		uima
 
 .if ${PORT_OPTIONS:MCONTRIB}
-.for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
+.for f in ${CONTRIBS}
 PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
+.for g in ${EXTRA_CONTRIBS_DIRS}
+PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-analyzers-${g}-${PORTVERSION}.jar
+.endfor
 .endif
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-DEMODIR=	contrib/demo
-
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/core/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
 .if ${PORT_OPTIONS:MCONTRIB}
 . for f in ${CONTRIBS}
-	${INSTALL_DATA} ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${JAVAJARDIR}
 . endfor
 . for d in ${EXTRA_CONTRIBS_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/${d}/${PORTNAME}-${d}-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/analysis/${d}/${PORTNAME}-analyzers-${d}-${PORTVERSION}.jar ${JAVAJARDIR}
 . endfor
-	${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/common/${PORTNAME}-${EXTRA_CONTRIBS_BASE}-${PORTVERSION}.jar ${JAVAJARDIR}
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+.for i in CHANGES.txt NOTICE.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
@@ -83,7 +86,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/${DEMODIR} && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/demo/${PORTNAME}-demo-${PORTVERSION}.jar ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/textproc/lucene4/distinfo
==============================================================================
--- head/textproc/lucene/distinfo	Thu Jan 24 18:16:37 2013	(r310939)
+++ head/textproc/lucene4/distinfo	Thu Jan 24 22:32:36 2013	(r310952)
@@ -1,2 +1,2 @@
-SHA256 (lucene-3.6.1.tgz) = 6d3c6e69d70545522fbbe07429bf1abbc84296721c24afa2b2c6384b8ddfc5ab
-SIZE (lucene-3.6.1.tgz) = 48768259
+SHA256 (lucene-4.1.0.tgz) = 6e0b88513d2c8eb2bf5c5da0a3266a823999158d7a9fa3dc015280d1860686c5
+SIZE (lucene-4.1.0.tgz) = 50047458

Modified: head/textproc/lucene4/pkg-descr
==============================================================================
--- head/textproc/lucene/pkg-descr	Thu Jan 24 18:16:37 2013	(r310939)
+++ head/textproc/lucene4/pkg-descr	Thu Jan 24 22:32:36 2013	(r310952)
@@ -1,4 +1,4 @@
-Lucene is a Java full-text search engine.  Lucene is not a complete
+Lucene 4.x is a Java full-text search engine.  Lucene is not a complete
 application, but rather a code library and API that can easily be used
 to add search capabilities to applications.