- Update to 2.9.1

4 files changed, 24 insertions, 108 deletions

diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile
index c8a4630d7c73..bf491689540f 100644
--- a/textproc/py-lucene/Makefile
+++ b/textproc/py-lucene/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	PyLucene
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.9.1
 CATEGORIES=	textproc devel python java
-MASTER_SITES=	http://downloads.osafoundation.org/PyLucene/jcc/
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	lucene/pylucene
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}${PATCHSET}-src-jcc
+DISTNAME=	pylucene-${PORTVERSION}${PATCHSET}-src
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A GCJ-compiled version of Java Lucene integrated with Python
@@ -28,10 +28,10 @@ JAVA_VERSION=	1.4+
 USE_GMAKE=	yes
 PATCHSET=	-1
 LUCENE_VER=	2.4.1
-#EGG_INFO=	lucene-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
-EGG_INFO=	lucene-${LUCENE_VER}-${PYTHON_VERSION:S/thon//}.egg-info
+EGG_INFO=	lucene-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
+#EGG_INFO=	lucene-${LUCENE_VER}-${PYTHON_VERSION:S/thon//}.egg-info
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${PATCHSET}
+WRKSRC=		${WRKDIR}/pylucene-${PORTVERSION}${PATCHSET}
 PLIST_SUB=	EGG_INFO=${EGG_INFO}
 
 MAKE_ENV+=	LD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/${ARCH}:${JAVA_HOME}/jre/lib/${ARCH}/server"
diff --git a/textproc/py-lucene/distinfo b/textproc/py-lucene/distinfo
index 774d2b67a3d7..922e47a912b6 100644
--- a/textproc/py-lucene/distinfo
+++ b/textproc/py-lucene/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyLucene-2.4.0-1-src-jcc.tar.gz) = c00cd13a7850246bdcbb407aabcca4bc
-SHA256 (PyLucene-2.4.0-1-src-jcc.tar.gz) = c3edd0bd14aa9170f3eb9798465fd5f3d17ead8d3df83f04a783e04676336387
-SIZE (PyLucene-2.4.0-1-src-jcc.tar.gz) = 3303901
+MD5 (pylucene-2.9.1-1-src.tar.gz) = 6deb5fe70f31545d51dff9fbcb84bc4d
+SHA256 (pylucene-2.9.1-1-src.tar.gz) = 0c7836d7cb7df5a1b939fec854c2d841b5849362258e684a28b3086ffa8e0fa8
+SIZE (pylucene-2.9.1-1-src.tar.gz) = 15926030
diff --git a/textproc/py-lucene/files/patch-Makefile b/textproc/py-lucene/files/patch-Makefile
index 44f3911f1f68..6bb4f2964066 100644
--- a/textproc/py-lucene/files/patch-Makefile
+++ b/textproc/py-lucene/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig	2008-10-20 09:29:22.000000000 +0800
-+++ Makefile	2009-03-27 08:53:23.000000000 +0800
-@@ -16,7 +16,7 @@
- 
- VERSION=2.4.0-1
- LUCENE_SVN_VER=HEAD
--LUCENE_VER=2.4.0
-+LUCENE_VER=2.4.1
- LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_4_0
- PYLUCENE:=$(shell pwd)
- LUCENE=lucene-java-$(LUCENE_VER)
-@@ -82,11 +82,13 @@
+--- Makefile.orig	2009-11-07 15:57:54.000000000 +0800
++++ Makefile	2009-11-18 20:32:56.000000000 +0800
+@@ -98,11 +98,11 @@
  #NUM_FILES=2
  
  # FreeBSD
@@ -19,89 +10,10 @@
 -#JCC=$(PYTHON) -m jcc
 -#NUM_FILES=2
 +PREFIX_PYTHON=$(PREFIX)
-+JAR=$(PREFIX)/bin/jar
 +ANT=$(PREFIX)/bin/ant
 +PYTHON=$(PREFIX_PYTHON)/bin/python
 +JCC=$(PYTHON) -m jcc
 +NUM_FILES=2
-+
  
  # Solaris   (Solaris 11, Python 2.4 32-bit, Sun Studio 12, Java 1.6)
  #PREFIX_PYTHON=/usr
-@@ -114,13 +116,13 @@
- 
- DEFINES=-DPYLUCENE_VER="\"$(VERSION)\"" -DLUCENE_VER="\"$(LUCENE_VER)\""
- 
--LUCENE_JAR=$(LUCENE)/build/lucene-core-$(LUCENE_VER).jar
--SNOWBALL_JAR=$(LUCENE)/build/contrib/snowball/lucene-snowball-$(LUCENE_VER).jar
--HIGHLIGHTER_JAR=$(LUCENE)/build/contrib/highlighter/lucene-highlighter-$(LUCENE_VER).jar
--ANALYZERS_JAR=$(LUCENE)/build/contrib/analyzers/lucene-analyzers-$(LUCENE_VER).jar
--REGEX_JAR=$(LUCENE)/build/contrib/regex/lucene-regex-$(LUCENE_VER).jar
--QUERIES_JAR=$(LUCENE)/build/contrib/queries/lucene-queries-$(LUCENE_VER).jar
--INSTANTIATED_JAR=$(LUCENE)/build/contrib/instantiated/lucene-instantiated-$(LUCENE_VER).jar
-+LUCENE_JAR=$(LUCENE)/lucene-core-$(LUCENE_VER).jar
-+SNOWBALL_JAR=$(LUCENE)/contrib/snowball/lucene-snowball-$(LUCENE_VER).jar
-+HIGHLIGHTER_JAR=$(LUCENE)/contrib/highlighter/lucene-highlighter-$(LUCENE_VER).jar
-+ANALYZERS_JAR=$(LUCENE)/contrib/analyzers/lucene-analyzers-$(LUCENE_VER).jar
-+REGEX_JAR=$(LUCENE)/contrib/regex/lucene-regex-$(LUCENE_VER).jar
-+QUERIES_JAR=$(LUCENE)/contrib/queries/lucene-queries-$(LUCENE_VER).jar
-+INSTANTIATED_JAR=$(LUCENE)/contrib/instantiated/lucene-instantiated-$(LUCENE_VER).jar
- EXTENSIONS_JAR=build/jar/extensions.jar
- 
- 
-@@ -129,12 +131,7 @@
- 
- default: all
- 
--$(LUCENE):
--	svn export -r $(LUCENE_SVN_VER) $(LUCENE_SVN) $(LUCENE)
--
--sources: $(LUCENE)
--
--to-orig: sources
-+to-orig: 
- 	mkdir -p $(LUCENE)-orig
- 	tar -C $(LUCENE) -cf - . | tar -C $(LUCENE)-orig -xvf -
- 
-@@ -154,30 +151,32 @@
- 	cd $(LUCENE); $(ANT) -Dversion=$(LUCENE_VER)
- 
- $(SNOWBALL_JAR): $(LUCENE_JAR)
--	cd $(LUCENE)/contrib/snowball; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/snowball; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(HIGHLIGHTER_JAR): $(LUCENE_JAR)
--	cd $(LUCENE)/contrib/highlighter; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/highlighter; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(ANALYZERS_JAR): $(LUCENE_JAR)
--	cd $(LUCENE)/contrib/analyzers; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/analyzers; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(REGEX_JAR): $(LUCENE_JAR)
--	rm -f $(LUCENE)/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
--	rm -f $(LUCENE)/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java
--	cd $(LUCENE)/contrib/regex; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/regex; $(JAR) xf lucene-regex-$(LUCENE_VER).jar
-+	rm -f $(LUCENE)/contrib/regex/org/apache/lucene/search/regex/JakartaRegexpCapabilities.class
-+	rm -f $(LUCENE)/contrib/regex/org/apache/regexp/RegexpTunnel.class
-+	cd $(LUCENE)/contrib/regex; $(JAR) cf lucene-regex-$(LUCENE_VER).jar org
-+	cd $(LUCENE)/contrib/regex; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(QUERIES_JAR): $(LUCENE_JAR)
--	cd $(LUCENE)/contrib/queries; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/queries; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(INSTANTIATED_JAR): $(LUCENE_JAR)
--	cd $(LUCENE)/contrib/instantiated; $(ANT) -Dversion=$(LUCENE_VER)
-+	cd $(LUCENE)/contrib/instantiated; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
- 
- $(EXTENSIONS_JAR): $(LUCENE_JAR)
- 	$(ANT) -Dlucene.dir=$(LUCENE)
- 
- JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(HIGHLIGHTER_JAR) $(ANALYZERS_JAR) \
--     $(REGEX_JAR) $(QUERIES_JAR) $(INSTANTIATED_JAR) $(EXTENSIONS_JAR)
-+     $(REGEX_JAR) $(QUERIES_JAR) $(INSTANTIATED_JAR)
- 
- 
- jars: $(JARS)
diff --git a/textproc/py-lucene/pkg-plist b/textproc/py-lucene/pkg-plist
index 782682ca06d1..18132c43d1ee 100644
--- a/textproc/py-lucene/pkg-plist
+++ b/textproc/py-lucene/pkg-plist
@@ -2,11 +2,15 @@
 %%PYTHON_SITELIBDIR%%/lucene/_lucene.so
 %%PYTHON_SITELIBDIR%%/lucene/__init__.py
 %%PYTHON_SITELIBDIR%%/lucene/__init__.pyc
-%%PYTHON_SITELIBDIR%%/lucene/lucene-analyzers-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-core-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-instantiated-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-highlighter-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-queries-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-regex-2.4.1.jar
-%%PYTHON_SITELIBDIR%%/lucene/lucene-snowball-2.4.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/collections.py
+%%PYTHON_SITELIBDIR%%/lucene/collections.pyc
+%%PYTHON_SITELIBDIR%%/lucene/extensions.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-analyzers-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-memory-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-core-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-instantiated-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-highlighter-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-queries-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-regex-2.9.1.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-snowball-2.9.1.jar
 @dirrm %%PYTHON_SITELIBDIR%%/lucene