ports/134776: [maintainer] databases/mysql-connector-java -- add conflicts

[Matthew Seaman]

>Number:         134776
>Category:       ports
>Synopsis:       [maintainer] databases/mysql-connector-java -- add conflicts
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 21 07:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.2-PRERELEASE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #60: Sun Mar 29 22:33:09 BST 2009 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Per pav's recent e-mail to freebsd-ports at ..., fix latest link for
mysql-connector-java50.  While I'm here, add a conflicts line to
mysql-connector-java.

>How-To-Repeat:
	
>Fix:

	

--- mysql-connector-java.diff begins here ---
diff -Nur /usr/ports/databases/mysql-connector-java/Makefile mysql-connector-java/Makefile
--- /usr/ports/databases/mysql-connector-java/Makefile	2008-10-25 08:33:38.000000000 +0100
+++ mysql-connector-java/Makefile	2009-05-21 07:39:35.000000000 +0100
@@ -14,6 +14,8 @@
 MAINTAINER=	m.seaman at infracaninophile.co.uk
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
+CONFLICTS=	mysql-connector-java*-5.0.*
+
 RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
 
 USE_JAVA=	yes
@@ -30,7 +32,7 @@
 
 PLIST_FILES=	%%JAVAJARDIR%%/jdbc2_0-stdext.jar \
 		%%JAVAJARDIR%%/jta-spec1_0_1.jar  \
-		%%JAVAJARDIR%%/mysql-connector-java.jar
+		%%JAVAJARDIR%%/${DESTJARFILE}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
--- mysql-connector-java.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: