From 577abe071caa51497eba66fe62606de1a973ab04 Mon Sep 17 00:00:00 2001 From: Cheng-Lung Sung Date: Thu, 30 Oct 2008 13:43:17 +0000 Subject: - Update to 2.4.0 --- textproc/py-lucene/Makefile | 3 +-- textproc/py-lucene/distinfo | 6 +++--- textproc/py-lucene/files/patch-Makefile | 32 +++++++++++++++++++------------- textproc/py-lucene/pkg-plist | 13 +++++++------ 4 files changed, 30 insertions(+), 24 deletions(-) (limited to 'textproc/py-lucene') diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile index ff0cf58c1171..a8a31199ba8b 100644 --- a/textproc/py-lucene/Makefile +++ b/textproc/py-lucene/Makefile @@ -7,8 +7,7 @@ # PORTNAME= PyLucene -PORTVERSION= 2.3.2 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= textproc devel python MASTER_SITES= http://downloads.osafoundation.org/PyLucene/jcc/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-lucene/distinfo b/textproc/py-lucene/distinfo index d11fbde6fd51..774d2b67a3d7 100644 --- a/textproc/py-lucene/distinfo +++ b/textproc/py-lucene/distinfo @@ -1,3 +1,3 @@ -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 +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 diff --git a/textproc/py-lucene/files/patch-Makefile b/textproc/py-lucene/files/patch-Makefile index f2cfca400878..dde6fab62647 100644 --- a/textproc/py-lucene/files/patch-Makefile +++ b/textproc/py-lucene/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-05-06 12:59:04.000000000 +0800 -+++ Makefile 2008-10-09 23:12:12.000000000 +0800 -@@ -75,11 +75,12 @@ +--- Makefile.orig 2008-10-20 09:29:22.000000000 +0800 ++++ Makefile 2008-10-21 08:00:27.000000000 +0800 +@@ -82,11 +82,13 @@ #NUM_FILES=2 # FreeBSD @@ -8,17 +8,18 @@ -#ANT=ant -#PYTHON=$(PREFIX_PYTHON)/bin/python -#JCC=$(PYTHON) -m jcc --#NUM_FILES=1 +-#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=1 ++NUM_FILES=2 ++ # Solaris (Solaris 11, Python 2.4 32-bit, Sun Studio 12, Java 1.6) #PREFIX_PYTHON=/usr -@@ -108,12 +109,12 @@ +@@ -114,13 +116,13 @@ DEFINES=-DPYLUCENE_VER="\"$(VERSION)\"" -DLUCENE_VER="\"$(LUCENE_VER)\"" @@ -28,16 +29,18 @@ -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 - PYLUCENE_CP:=$(LUCENE_JAR):$(HIGHLIGHTER_JAR):$(SNOWBALL_JAR):$(ANALYZERS_JAR):$(CLASSES):$(REGEX_JAR) -@@ -124,12 +125,7 @@ + +@@ -129,12 +131,7 @@ default: all @@ -51,7 +54,7 @@ mkdir -p $(LUCENE)-orig tar -C $(LUCENE) -cf - . | tar -C $(LUCENE)-orig -xvf - -@@ -149,27 +145,29 @@ +@@ -154,30 +151,32 @@ cd $(LUCENE); $(ANT) -Dversion=$(LUCENE_VER) $(SNOWBALL_JAR): $(LUCENE_JAR) @@ -80,13 +83,16 @@ - 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) -+ $(ANT) -buildfile build.xml -Dlucene.dir=$(LUCENE) + $(ANT) -Dlucene.dir=$(LUCENE) JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(HIGHLIGHTER_JAR) $(ANALYZERS_JAR) \ -- $(REGEX_JAR) $(QUERIES_JAR) $(EXTENSIONS_JAR) -+ $(REGEX_JAR) $(QUERIES_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 54f0a327ffc7..2ba5487051e1 100644 --- a/textproc/py-lucene/pkg-plist +++ b/textproc/py-lucene/pkg-plist @@ -2,10 +2,11 @@ %%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-highlighter-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 +%%PYTHON_SITELIBDIR%%/lucene/lucene-analyzers-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-core-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-instantiated-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-highlighter-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-queries-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-regex-2.4.0.jar +%%PYTHON_SITELIBDIR%%/lucene/lucene-snowball-2.4.0.jar @dirrm %%PYTHON_SITELIBDIR%%/lucene -- cgit v1.2.3