From 7828dac949909f7bebf14e8fe4dcf71666da5b2b Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Mon, 24 Dec 2007 22:59:18 +0000
Subject: - Update to 4.96a - Update pkg-descr - Add CONFLICTS for future
 databases/adodb5

PR:	ports/117964
---
 databases/adodb/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'databases/adodb/Makefile')

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 130c9781dfb6..a53a5b2fdd66 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	4.93a
+PORTVERSION=	4.96a
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	adodb
@@ -18,6 +18,8 @@ COMMENT=	Database library for PHP
 
 USE_PHP=	pcre
 
+CONFLICTS=	adodb-5.*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
@@ -26,9 +28,7 @@ PLIST_SUB=	ADODB_DIR=${ADODB_DIR}
 
 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
 
-.if !defined (WITHOUT_ADODB_OPTIONS)
 OPTIONS=	TESTS "Install tests" off
-.endif
 
 .include <bsd.port.pre.mk>
 
-- 
cgit v1.2.3