Index: CVSROOT/modules =================================================================== RCS file: /home/pcvs/CVSROOT/modules,v retrieving revision 1.16611 diff -u -r1.16611 modules --- CVSROOT/modules 15 Nov 2006 14:18:37 -0000 1.16611 +++ CVSROOT/modules 15 Nov 2006 16:41:48 -0000 @@ -12079,7 +12079,7 @@ py-logging ports/devel/py-logging py-logilab-common ports/devel/py-logilab-common py-ltxml ports/textproc/py-ltxml -py-lucene ports/devel/py-lucene +py-lucene ports/textproc/py-lucene py-lzma ports/archivers/py-lzma py-m2crypto ports/security/py-m2crypto py-mad ports/audio/py-mad Index: ports/MOVED =================================================================== RCS file: /home/pcvs/ports/MOVED,v retrieving revision 1.1183 diff -u -r1.1183 MOVED --- ports/MOVED 12 Nov 2006 06:43:14 -0000 1.1183 +++ ports/MOVED 15 Nov 2006 16:41:48 -0000 @@ -2539,3 +2539,4 @@ editors/openoffice.org-2.0|editors/openoffice.org-2|2006-11-12|Better version number handling editors/openoffice.org-2.0-devel|editors/openoffice.org-2-devel|2006-11-12|Better version number handling devel/ply|devel/py-ply|2006-11-12|Rename to consistency with other Python ports +devel/py-lucene|textproc/py-lucene|2006-11-15|Moved to be consistent with Lucene port Index: ports/devel/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/Makefile,v retrieving revision 1.2513 diff -u -r1.2513 Makefile --- ports/devel/Makefile 15 Nov 2006 14:18:11 -0000 1.2513 +++ ports/devel/Makefile 15 Nov 2006 16:41:48 -0000 @@ -1714,7 +1714,6 @@ SUBDIR += py-log4py SUBDIR += py-logging SUBDIR += py-logilab-common - SUBDIR += py-lucene SUBDIR += py-mx-experimental SUBDIR += py-ncurses SUBDIR += py-ocempgui Index: ports/textproc/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/Makefile,v retrieving revision 1.1074 diff -u -r1.1074 Makefile --- ports/textproc/Makefile 15 Nov 2006 08:16:39 -0000 1.1074 +++ ports/textproc/Makefile 15 Nov 2006 16:41:48 -0000 @@ -733,6 +733,7 @@ SUBDIR += py-libxml2 SUBDIR += py-libxslt SUBDIR += py-ltxml + SUBDIR += py-lucene SUBDIR += py-pyx12 SUBDIR += py-rdflib SUBDIR += py-reverend Index: ports/devel/py-lucene/Makefile =================================================================== RCS file: ports/devel/py-lucene/Makefile diff -N ports/devel/py-lucene/Makefile --- ports/devel/py-lucene/Makefile 7 Nov 2006 15:37:00 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,54 +0,0 @@ -# -# Ports collection makefile for: py-lucene -# Date created: Nov 2, 2006 -# Whom: Frank J. Laszlo -# -# $FreeBSD: ports/devel/py-lucene/Makefile,v 1.3 2006/11/07 15:37:00 laszlof Exp $ -# - -PORTNAME= PyLucene -PORTVERSION= 2.0.0 -PATCHSET= -3 -PORTREVISION= 1 -CATEGORIES= devel python java -MASTER_SITES= http://downloads.osafoundation.org/PyLucene/src/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-src-${PORTVERSION}${PATCHSET} - -MAINTAINER= laszlof@FreeBSD.org -COMMENT= A GCJ-compiled version of Java Lucene integrated with Python - -BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant -RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt - -USE_PYTHON= yes -USE_JAVA= yes -USE_GMAKE= yes -USE_LDCONFIG= yes - -OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options - -OPTIONS= BDB "Compile with support for Berkley DB" Off - -.include - -_GCC_LIBDIR!= (cd ${PORTSDIR}/lang/gcc41;make -V TARGLIB) -GCC_LIBDIR= ${_GCC_LIBDIR:S/${PREFIX}/${LOCALBASE}/} - -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=${ANT} \ - LDFLAGS+=-L${LOCALBASE}/lib - -.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 Index: ports/devel/py-lucene/distinfo =================================================================== RCS file: ports/devel/py-lucene/distinfo diff -N ports/devel/py-lucene/distinfo --- ports/devel/py-lucene/distinfo 4 Nov 2006 00:03:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -MD5 (PyLucene-src-2.0.0-3.tar.gz) = f322c2101d876f252710b8e4607a1741 -SHA256 (PyLucene-src-2.0.0-3.tar.gz) = 22c889751d1859e3f016b32ed050b2b7da401381589e754b5d59e014eab56996 -SIZE (PyLucene-src-2.0.0-3.tar.gz) = 4167624 Index: ports/devel/py-lucene/pkg-descr =================================================================== RCS file: ports/devel/py-lucene/pkg-descr diff -N ports/devel/py-lucene/pkg-descr --- ports/devel/py-lucene/pkg-descr 4 Nov 2006 00:03:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ -PyLucene is a GCJ-compiled version of Java Lucene integrated with Python. -Its goal is to allow you to use Lucene's text indexing and searching -capabilities from Python. It is designed to be API compatible with the -latest version of Java Lucene. - -WWW: http://pylucene.osafoundation.org/ Index: ports/devel/py-lucene/pkg-plist =================================================================== RCS file: ports/devel/py-lucene/pkg-plist diff -N ports/devel/py-lucene/pkg-plist --- ports/devel/py-lucene/pkg-plist 7 Nov 2006 01:56:06 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -lib/python2.4/site-packages/README -lib/python2.4/site-packages/PyLucene.py -lib/python2.4/site-packages/_PyLucene.so -lib/python2.4/site-packages/security/classpath.security -lib/python2.4/site-packages/security/libgcj.security Index: ports/textproc/py-lucene/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/py-lucene/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- ports/textproc/py-lucene/Makefile 7 Nov 2006 15:37:00 -0000 1.3 +++ ports/textproc/py-lucene/Makefile 15 Nov 2006 16:41:48 -0000 @@ -8,9 +8,8 @@ PORTNAME= PyLucene PORTVERSION= 2.0.0 -PATCHSET= -3 PORTREVISION= 1 -CATEGORIES= devel python java +CATEGORIES= textproc devel python MASTER_SITES= http://downloads.osafoundation.org/PyLucene/src/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-src-${PORTVERSION}${PATCHSET} @@ -18,14 +17,12 @@ MAINTAINER= laszlof@FreeBSD.org COMMENT= A GCJ-compiled version of Java Lucene integrated with Python -BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant -RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcj41:${PORTSDIR}/lang/gcc41 -USE_PYTHON= yes -USE_JAVA= yes +USE_PYTHON= 2.4+ USE_GMAKE= yes USE_LDCONFIG= yes +PATCHSET= -3 OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options @@ -38,8 +35,9 @@ 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=${ANT} \ - LDFLAGS+=-L${LOCALBASE}/lib + JCC=${LOCALBASE}/bin/gcj41 JCCH=${LOCALBASE}/bin/gcjh41 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 Index: ports/textproc/py-lucene/pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/py-lucene/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- ports/textproc/py-lucene/pkg-plist 7 Nov 2006 01:56:06 -0000 1.2 +++ ports/textproc/py-lucene/pkg-plist 15 Nov 2006 16:41:48 -0000 @@ -1,5 +1,5 @@ -lib/python2.4/site-packages/README -lib/python2.4/site-packages/PyLucene.py -lib/python2.4/site-packages/_PyLucene.so -lib/python2.4/site-packages/security/classpath.security -lib/python2.4/site-packages/security/libgcj.security +%%PYTHON_SITELIBDIR%%/PyLucene.py +%%PYTHON_SITELIBDIR%%/_PyLucene.so +%%PYTHON_SITELIBDIR%%/security/classpath.security +%%PYTHON_SITELIBDIR%%/security/libgcj.security +@dirrmtry %%PYTHON_SITELIBDIR%%/security