3 files changed, 30 insertions, 17 deletions

diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile
index 0acac9ac6e43..6906e72d786a 100644
--- a/textproc/py-lucene/Makefile
+++ b/textproc/py-lucene/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	PyLucene
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	http://downloads.osafoundation.org/PyLucene/jcc/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -31,8 +32,7 @@ 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} \
-		ANT=${LOCALBASE}/bin/ant PYTHON=${PYTHON_CMD} \
+MAKE_ARGS+=	PREFIX=${PREFIX} PREFIX_PYTHON=${LOCALBASE} PYTHON=${PYTHON_CMD} \
 		LDFLAGS+=-L${LOCALBASE}/lib PYTHON_INC=${PYTHON_INCLUDEDIR} \
 		PYTHON_SITE=${PYTHON_SITELIBDIR}
 
@@ -40,6 +40,6 @@ 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
+#		cd ${WRKSRC}; env ${MAKE_ENV} ${GMAKE} test
 
 .include <bsd.port.mk>
diff --git a/textproc/py-lucene/files/patch-Makefile b/textproc/py-lucene/files/patch-Makefile
index 20bbc3bc556c..f2cfca400878 100644
--- a/textproc/py-lucene/files/patch-Makefile
+++ b/textproc/py-lucene/files/patch-Makefile
@@ -1,17 +1,24 @@
 --- 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
++++ Makefile	2008-10-09 23:12:12.000000000 +0800
+@@ -75,11 +75,12 @@
+ #NUM_FILES=2
+ 
+ # FreeBSD
+-#PREFIX_PYTHON=/usr
+-#ANT=ant
+-#PYTHON=$(PREFIX_PYTHON)/bin/python
 -#JCC=$(PYTHON) -m jcc
 -#NUM_FILES=1
++PREFIX_PYTHON=$(PREFIX)
++JAR=$(PREFIX)/bin/jar
++ANT=$(PREFIX)/bin/ant
++PYTHON=$(PREFIX_PYTHON)/bin/python
 +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 @@
+@@ -108,12 +109,12 @@
  
  DEFINES=-DPYLUCENE_VER="\"$(VERSION)\"" -DLUCENE_VER="\"$(LUCENE_VER)\""
  
@@ -30,7 +37,7 @@
  EXTENSIONS_JAR=build/jar/extensions.jar
  
  PYLUCENE_CP:=$(LUCENE_JAR):$(HIGHLIGHTER_JAR):$(SNOWBALL_JAR):$(ANALYZERS_JAR):$(CLASSES):$(REGEX_JAR)
-@@ -124,12 +124,7 @@
+@@ -124,12 +125,7 @@
  
  default: all
  
@@ -44,7 +51,7 @@
  	mkdir -p $(LUCENE)-orig
  	tar -C $(LUCENE) -cf - . | tar -C $(LUCENE)-orig -xvf -
  
-@@ -149,27 +144,27 @@
+@@ -149,27 +145,29 @@
  	cd $(LUCENE); $(ANT) -Dversion=$(LUCENE_VER)
  
  $(SNOWBALL_JAR): $(LUCENE_JAR)
@@ -60,9 +67,13 @@
 +	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
+-	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)
@@ -70,11 +81,12 @@
 +	cd $(LUCENE)/contrib/queries; $(ANT) -buildfile ../../build.xml -Dversion=$(LUCENE_VER)
  
  $(EXTENSIONS_JAR): $(LUCENE_JAR)
- 	$(ANT) -Dlucene.dir=$(LUCENE)
+-	$(ANT) -Dlucene.dir=$(LUCENE)
++	$(ANT) -buildfile build.xml -Dlucene.dir=$(LUCENE)
  
  JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(HIGHLIGHTER_JAR) $(ANALYZERS_JAR) \
 -     $(REGEX_JAR) $(QUERIES_JAR) $(EXTENSIONS_JAR)
-+     $(QUERIES_JAR)
++     $(REGEX_JAR) $(QUERIES_JAR)
  
  
  jars: $(JARS)
diff --git a/textproc/py-lucene/pkg-plist b/textproc/py-lucene/pkg-plist
index 3b72003b9f2e..54f0a327ffc7 100644
--- a/textproc/py-lucene/pkg-plist
+++ b/textproc/py-lucene/pkg-plist
@@ -2,9 +2,10 @@
 %%PYTHON_SITELIBDIR%%/lucene/_lucene.so
 %%PYTHON_SITELIBDIR%%/lucene/__init__.py
 %%PYTHON_SITELIBDIR%%/lucene/__init__.pyc
+%%PYTHON_SITELIBDIR%%/lucene/lucene-analyzers-2.3.2.jar
 %%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
+%%PYTHON_SITELIBDIR%%/lucene/lucene-regex-2.3.2.jar
+%%PYTHON_SITELIBDIR%%/lucene/lucene-snowball-2.3.2.jar
 @dirrm %%PYTHON_SITELIBDIR%%/lucene