--- /usr/ports/mail/bogofilter-sqlite/Makefile	Wed Jun  8 22:34:33 2005
+++ /usr/home/emma/ports/mail/bogofilter-sqlite/Makefile	Mon Oct 24 01:28:05 2005
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
@@ -14,8 +13,7 @@
 
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-CONFLICTS=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tdb-[0-9]* \
-		[a-z][a-z]-bogofilter-[0-9]* bogofilter-current-[0-9]*
+CONFLICTS=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=sqlite
 BF_CPPFLAGS=	-I${LOCALBASE}/include
@@ -23,9 +21,5 @@
 DESCR=		${PKGDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../bogofilter
-
-pre-configure:
-	${REINPLACE_CMD} 's/^INTEGRITY_TESTS.*/INTEGRITY_TESTS=t.lock1/' \
-		${WRKSRC}/src/tests/Makefile.in
 
 .include "${MASTERDIR}/Makefile"