svn commit: r310915 - head/textproc/lucene

[Jason Helfman]

Author: jgh
Date: Thu Jan 24 06:54:35 2013
New Revision: 310915
URL: http://svnweb.freebsd.org/changeset/ports/310915

Log:
  - revert as this will cause openoffice-3-devel breakage
  
  Reported by:	pfg@

Modified:
  head/textproc/lucene/Makefile
  head/textproc/lucene/distinfo

Modified: head/textproc/lucene/Makefile
==============================================================================
--- head/textproc/lucene/Makefile	Thu Jan 24 04:15:52 2013	(r310914)
+++ head/textproc/lucene/Makefile	Thu Jan 24 06:54:35 2013	(r310915)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lucene
-PORTVERSION=	4.1.0
+PORTVERSION=	3.6.1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
@@ -27,54 +27,55 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-
 
 CONTRIBS=	benchmark \
 		demo \
-		codecs \
 		facet	\
 		grouping \
 		highlighter \
-		join \
+		icu \
+		instantiated \
+		join	\
 		memory \
 		misc \
+		pruning \
 		queries \
-		queryparser \
-		sandbox \
+		queryparser	\
+		remote	\
 		spatial \
-		suggest
+		spellchecker \
+		xml-query-parser
 
-EXTRA_CONTRIBS_DIRS=	common \
-		icu \
-		kuromoji \
-		morfologik \
+EXTRA_CONTRIBS_BASE=	analyzers
+
+EXTRA_CONTRIBS_DIRS=	kuromoji \
 		phonetic \
 		smartcn \
-		stempel \
-		uima
+		stempel
 
 .if ${PORT_OPTIONS:MCONTRIB}
-.for f in ${CONTRIBS}
+.for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
 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}/core/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
 .if ${PORT_OPTIONS:MCONTRIB}
 . for f in ${CONTRIBS}
-	${INSTALL_DATA} ${WRKSRC}/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${JAVAJARDIR}
 . endfor
 . for d in ${EXTRA_CONTRIBS_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/analysis/${d}/${PORTNAME}-analyzers-${d}-${PORTVERSION}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/${d}/${PORTNAME}-${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 NOTICE.txt README.txt
+.for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
@@ -82,7 +83,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/demo/${PORTNAME}-demo-${PORTVERSION}.jar ${EXAMPLESDIR}
+	(cd ${WRKSRC}/${DEMODIR} && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>

Modified: head/textproc/lucene/distinfo
==============================================================================
--- head/textproc/lucene/distinfo	Thu Jan 24 04:15:52 2013	(r310914)
+++ head/textproc/lucene/distinfo	Thu Jan 24 06:54:35 2013	(r310915)
@@ -1,2 +1,2 @@
-SHA256 (lucene-4.1.0.tgz) = 6e0b88513d2c8eb2bf5c5da0a3266a823999158d7a9fa3dc015280d1860686c5
-SIZE (lucene-4.1.0.tgz) = 50047458
+SHA256 (lucene-3.6.1.tgz) = 6d3c6e69d70545522fbbe07429bf1abbc84296721c24afa2b2c6384b8ddfc5ab
+SIZE (lucene-3.6.1.tgz) = 48768259