Index: head/databases/p5-DBI/Makefile
===================================================================
--- head/databases/p5-DBI/Makefile	(revision 109423)
+++ head/databases/p5-DBI/Makefile	(revision 109424)
@@ -1,65 +1,65 @@
 # New ports collection makefile for:	p5-DBI
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	DBI
 PORTVERSION=	1.42
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
 
 .if defined(WITH_PROXY)
 BUILD_DEPENDS=	${SITE_PERL}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .endif
 
-CONFLICTS=	p5-DBI-137-1.37
+CONFLICTS=	p5-DBI-1.3*
 PERL_CONFIGURE=	yes
 
 MAN1=		dbiprof.1 \
 		dbiproxy.1
 MAN3=		Bundle::DBI.3 \
 		DBD::DBM.3 \
 		DBD::File.3 \
 		DBD::Proxy.3 \
 		DBD::Sponge.3 \
 		DBI.3 \
 		DBI::Const::GetInfo::ANSI.3 \
 		DBI::Const::GetInfo::ODBC.3 \
 		DBI::Const::GetInfoReturn.3 \
 		DBI::Const::GetInfoType.3 \
 		DBI::DBD.3 \
 		DBI::DBD::Metadata.3 \
 		DBI::FAQ.3 \
 		DBI::Profile.3 \
 		DBI::ProfileData.3 \
 		DBI::ProfileDumper.3 \
 		DBI::ProfileDumper::Apache.3 \
 		DBI::ProxyServer.3 \
 		DBI::PurePerl.3 \
 		DBI::SQL::Nano.3 \
 		DBI::W32ODBC.3 \
 		Win32::DBIODBC.3
 
 .if !defined(WITH_PROXY)
 pre-everything::
 	@${ECHO_CMD} "If you need DBI::Proxy, try to set WITH_PROXY."
 	@${ECHO_CMD} ""
 	@sleep 1
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		Please install databases/p5-DBI-137 instead
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/p5-DBI/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.54
\ No newline at end of property
+1.55
\ No newline at end of property
Index: head/databases/p5-DBI-137/Makefile
===================================================================
--- head/databases/p5-DBI-137/Makefile	(revision 109423)
+++ head/databases/p5-DBI-137/Makefile	(revision 109424)
@@ -1,55 +1,55 @@
 # New ports collection makefile for:	p5-DBI
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	DBI
 PORTVERSION=	1.37
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBI
 PKGNAMEPREFIX=	p5-
-PKGNAMESUFFIX=	-137
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
 
 .if defined(WITH_PROXY)
 BUILD_DEPENDS=	${SITE_PERL}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .endif
 
-CONFLICTS=	p5-DBI-*
+CONFLICTS=	p5-DBI-1.[!3]*
 PERL_CONFIGURE=	yes
+LATEST_LINK=	p5-DBI-137
 
 MAN1=		dbiprof.1 \
 		dbiproxy.1
 MAN3=		Bundle::DBI.3 \
 		DBD::Proxy.3 \
 		DBI.3 \
 		DBI::Const::GetInfo::ANSI.3 \
 		DBI::Const::GetInfo::ODBC.3 \
 		DBI::Const::GetInfoReturn.3 \
 		DBI::Const::GetInfoType.3 \
 		DBI::DBD.3 \
 		DBI::DBD::Metadata.3 \
 		DBI::FAQ.3 \
 		DBI::Profile.3 \
 		DBI::ProfileData.3 \
 		DBI::ProfileDumper.3 \
 		DBI::ProfileDumper::Apache.3 \
 		DBI::ProxyServer.3 \
 		DBI::PurePerl.3 \
 		DBI::W32ODBC.3 \
 		Win32::DBIODBC.3
 
 .if !defined(WITH_PROXY)
 pre-everything::
 	@${ECHO_CMD} "If you need DBI::Proxy, try to set WITH_PROXY."
 	@${ECHO_CMD} ""
 	@sleep 1
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/databases/p5-DBI-137/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.48
\ No newline at end of property
+1.49
\ No newline at end of property