- Update to 2.3.2

- buildable on amd64

4 files changed, 113 insertions, 38 deletions

diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile
index 7e471b29c255..0acac9ac6e43 100644
--- a/textproc/py-lucene/Makefile
+++ b/textproc/py-lucene/Makefile
@@ -7,49 +7,39 @@
 #
 
 PORTNAME=	PyLucene
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.2
 CATEGORIES=	textproc devel python
-MASTER_SITES=	http://downloads.osafoundation.org/PyLucene/src/
+MASTER_SITES=	http://downloads.osafoundation.org/PyLucene/jcc/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}${PATCHSET}
+DISTNAME=	${PORTNAME}-${PORTVERSION}${PATCHSET}-src-jcc
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A GCJ-compiled version of Java Lucene integrated with Python
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gcj41:${PORTSDIR}/lang/gcc41
+BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
+		${PYTHON_PKGNAMEPREFIX}jcc>0:${PORTSDIR}/devel/py-jcc
+EXTRACT_DEPENDS=lucene>=2.3.2:${PORTSDIR}/textproc/lucene:extract
 
 USE_PYTHON=	2.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
 PATCHSET=	-1
+EGG_INFO=	lucene-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
 
-OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
-
-OPTIONS=	BDB "Compile with support for Berkley DB" Off
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		Broken dependency on !i386
-.endif
-
-_GCC_LIBDIR!=	(cd ${PORTSDIR}/lang/gcc41;make -V TARGLIB)
-GCC_LIBDIR=	${_GCC_LIBDIR:S/${PREFIX}/${LOCALBASE}/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${PATCHSET}
+PLIST_SUB=	EGG_INFO=${EGG_INFO}
 
+MAKE_ENV+=	LD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/${ARCH}:${JAVA_HOME}/jre/lib/${ARCH}/server"
 MAKE_ARGS+=	PREFIX=${PREFIX} PREFIX_PYTHON=${LOCALBASE} GCJ_HOME=${LOCALBASE} \
-		GCJ_LIBDIR=${GCC_LIBDIR} CC=${LOCALBASE}/bin/gcc41 CXX=${LOCALBASE}/bin/g++41 \
-		JCC=${LOCALBASE}/bin/gcj41 JCCH=${LOCALBASE}/bin/gcjh41 PYTHON=${PYTHON_CMD} \
+		ANT=${LOCALBASE}/bin/ant PYTHON=${PYTHON_CMD} \
 		LDFLAGS+=-L${LOCALBASE}/lib PYTHON_INC=${PYTHON_INCLUDEDIR} \
 		PYTHON_SITE=${PYTHON_SITELIBDIR}
 
-.if defined(WITH_BDB)
-BROKEN=		Will not compile with BDB support
-REAL_BDB_VER=	${BDB_VER:C/([0-9])([0-9])/\1.\2/g}
-_BDB_WRKSRC!=	(cd ../../databases/db44;make -V WRKSRC)
-BDB_WRKSRC=	${_BDB_WRKSRC:S/\/build_unix//}
-MAKE_ARGS+=	DB=${BDB_WRKSRC} PREFIX_DB=${LOCALBASE} DB_VER=${REAL_BDB_VER} DB_LIB_VER=${REAL_BDB_VER}
-USE_BDB=	44
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/databases/db44:extract
-.endif
-
-.include <bsd.port.post.mk>
+post-extract:
+		${CP} -R ${PORTSDIR}/textproc/lucene/work/lucene-${PORTVERSION} ${WRKSRC}/lucene-java-${PORTVERSION}
+
+#regression-test:
+#		cd ${WRKSRC}; env ${MAKE_ARGS} ${MAKE_ENV} ${GMAKE} test
+
+.include <bsd.port.mk>
diff --git a/textproc/py-lucene/distinfo b/textproc/py-lucene/distinfo
index 07b090f86967..d11fbde6fd51 100644
--- a/textproc/py-lucene/distinfo
+++ b/textproc/py-lucene/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyLucene-src-2.2.0-1.tar.gz) = 0e77b01679c93df14972d983a7111ef6
-SHA256 (PyLucene-src-2.2.0-1.tar.gz) = cfa1018226fb76a85c74e942a90f3e88b1c599ac979d532b1fab4ed4dac0c132
-SIZE (PyLucene-src-2.2.0-1.tar.gz) = 4360210
+MD5 (PyLucene-2.3.2-1-src-jcc.tar.gz) = 79d5b30238b8a9003fe5372385cd783f
+SHA256 (PyLucene-2.3.2-1-src-jcc.tar.gz) = d3f504f24fa9f7fac7c679dfbddc75141b6059f652511bc28c8e437de3c54804
+SIZE (PyLucene-2.3.2-1-src-jcc.tar.gz) = 3291681
diff --git a/textproc/py-lucene/files/patch-Makefile b/textproc/py-lucene/files/patch-Makefile
new file mode 100644
index 000000000000..20bbc3bc556c
--- /dev/null
+++ b/textproc/py-lucene/files/patch-Makefile
@@ -0,0 +1,80 @@
+--- Makefile.orig	2008-05-06 12:59:04.000000000 +0800
++++ Makefile	2008-05-15 22:27:11.000000000 +0800
+@@ -78,8 +78,8 @@
+ #PREFIX_PYTHON=/usr
+ #ANT=ant
+ #PYTHON=$(PREFIX_PYTHON)/bin/python
+-#JCC=$(PYTHON) -m jcc
+-#NUM_FILES=1
++JCC=$(PYTHON) -m jcc
++NUM_FILES=1
+ 
+ # Solaris   (Solaris 11, Python 2.4 32-bit, Sun Studio 12, Java 1.6)
+ #PREFIX_PYTHON=/usr
+@@ -108,12 +108,12 @@
+ 
+ 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
++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
+ EXTENSIONS_JAR=build/jar/extensions.jar
+ 
+ PYLUCENE_CP:=$(LUCENE_JAR):$(HIGHLIGHTER_JAR):$(SNOWBALL_JAR):$(ANALYZERS_JAR):$(CLASSES):$(REGEX_JAR)
+@@ -124,12 +124,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 -
+ 
+@@ -149,27 +144,27 @@
+ 	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; $(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)
+ 
+ $(EXTENSIONS_JAR): $(LUCENE_JAR)
+ 	$(ANT) -Dlucene.dir=$(LUCENE)
+ 
+ JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(HIGHLIGHTER_JAR) $(ANALYZERS_JAR) \
+-     $(REGEX_JAR) $(QUERIES_JAR) $(EXTENSIONS_JAR)
++     $(QUERIES_JAR)
+ 
+ 
+ jars: $(JARS)
diff --git a/textproc/py-lucene/pkg-plist b/textproc/py-lucene/pkg-plist
index f1928347069a..3b72003b9f2e 100644
--- a/textproc/py-lucene/pkg-plist
+++ b/textproc/py-lucene/pkg-plist
@@ -1,5 +1,10 @@
-%%PYTHON_SITELIBDIR%%/PyLucene.py
-%%PYTHON_SITELIBDIR%%/_PyLucene.so
-%%PYTHON_SITELIBDIR%%/security/classpath.security
-%%PYTHON_SITELIBDIR%%/security/libgcj.security
-@dirrmtry %%PYTHON_SITELIBDIR%%/security
+%%PYTHON_SITELIBDIR%%/%%EGG_INFO%%
+%%PYTHON_SITELIBDIR%%/lucene/_lucene.so
+%%PYTHON_SITELIBDIR%%/lucene/__init__.py
+%%PYTHON_SITELIBDIR%%/lucene/__init__.pyc
+%%PYTHON_SITELIBDIR%%/lucene/lucene-core-2.3.2.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-snowball-2.3.2.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-highlighter-2.3.2.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-analyzers-2.3.2.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-queries-2.3.2.jar
+@dirrm %%PYTHON_SITELIBDIR%%/lucene