Index: head/textproc/py-lucene/Makefile =================================================================== --- head/textproc/py-lucene/Makefile (revision 222231) +++ head/textproc/py-lucene/Makefile (revision 222232) @@ -1,46 +1,45 @@ # # Ports collection makefile for: py-lucene # Date created: Nov 2, 2006 # Whom: Frank J. Laszlo # # $FreeBSD$ # 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} DISTNAME= ${PORTNAME}-${PORTVERSION}${PATCHSET}-src-jcc MAINTAINER= clsung@FreeBSD.org COMMENT= A GCJ-compiled version of Java Lucene integrated with Python BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ ${PYTHON_PKGNAMEPREFIX}jcc>0:${PORTSDIR}/devel/py-jcc \ ${NONEXISTENT}:${PORTSDIR}/textproc/lucene:extract USE_PYTHON= 2.4+ USE_GCC= 4.2+ USE_JAVA= yes JAVA_VERSION= 1.4+ USE_GMAKE= yes PATCHSET= -1 EGG_INFO= lucene-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info 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} PYTHON=${PYTHON_CMD} \ LDFLAGS+=-L${LOCALBASE}/lib PYTHON_INC=${PYTHON_INCLUDEDIR} \ PYTHON_SITE=${PYTHON_SITELIBDIR} pre-build: ${CP} -R ${WRKDIR}/../../lucene/work/lucene-${PORTVERSION} ${WRKSRC}/lucene-java-${PORTVERSION} #regression-test: # cd ${WRKSRC}; env ${MAKE_ENV} ${GMAKE} test .include Property changes on: head/textproc/py-lucene/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/textproc/py-lucene/distinfo =================================================================== --- head/textproc/py-lucene/distinfo (revision 222231) +++ head/textproc/py-lucene/distinfo (revision 222232) @@ -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 Property changes on: head/textproc/py-lucene/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/textproc/py-lucene/files/patch-Makefile =================================================================== --- head/textproc/py-lucene/files/patch-Makefile (revision 222231) +++ head/textproc/py-lucene/files/patch-Makefile (revision 222232) @@ -1,92 +1,98 @@ ---- 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 -#PREFIX_PYTHON=/usr -#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)\"" -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 - PYLUCENE_CP:=$(LUCENE_JAR):$(HIGHLIGHTER_JAR):$(SNOWBALL_JAR):$(ANALYZERS_JAR):$(CLASSES):$(REGEX_JAR) -@@ -124,12 +125,7 @@ +@@ -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 - -@@ -149,27 +145,29 @@ +@@ -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) -+ $(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) Property changes on: head/textproc/py-lucene/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/textproc/py-lucene/pkg-plist =================================================================== --- head/textproc/py-lucene/pkg-plist (revision 222231) +++ head/textproc/py-lucene/pkg-plist (revision 222232) @@ -1,11 +1,12 @@ %%PYTHON_SITELIBDIR%%/%%EGG_INFO%% %%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 Property changes on: head/textproc/py-lucene/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property