Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/py-lucene/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	7 Nov 2006 15:37:00 -0000	1.3
+++ Makefile	15 Nov 2006 12:30:21 -0000
@@ -8,9 +8,8 @@
 
 PORTNAME=	PyLucene
 PORTVERSION=	2.0.0
-PATCHSET=	-3
 PORTREVISION=	1
-CATEGORIES=	devel python java
+CATEGORIES=	devel textproc 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: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/textproc/py-lucene/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	7 Nov 2006 01:56:06 -0000	1.2
+++ pkg-plist	15 Nov 2006 12:30:21 -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