ports/76149: [ maintainer ] databases/mysql-connector-java -- update to 3.1.6

[Matthew Seaman]

>Number:         76149
>Category:       ports
>Synopsis:       [ maintainer ] databases/mysql-connector-java -- update to 3.1.6
>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:   Wed Jan 12 15:30:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD gravitas.thebunker.net 5.3-STABLE FreeBSD 5.3-STABLE #4: Thu Dec 23 16:36:19 GMT 2004 root at gravitas.thebunker.net:/usr/obj/usr/src/sys/GRAVITAS i386


	
>Description:

Update to version 3.1.6 -- This is a major update to a new code
branch, and development on the 3.0 branch will now be limited to
critical bug-fixes.  From the release announcement:

    Version 3.1.6 is the first production release of the 3.1 series
    that is suitable for use with all versions of MySQL, including
    MySQL-4.1 or MySQL-5.0. Connector/J 3.1.6 is required if you want
    to use server-side prepared statements MySQL-4.1.2 or newer, or
    CallableStatements with MySQL-5.0.

        http://lists.mysql.com/announce/250

Anyone upgrading from the 3.0 series should first read
http://dev.mysql.com/doc/connector/j/en/#id2424819

This update adds both a BUILD_DEPENDS and a RUN_DEPENDS on devel/log4j
(unless you use the WITHOUT_COMPILE option, where there's only a
RUN_DEPENDS)

   File/Directory Changes

         Makefile                -- modified
         distinfo                -- modified
         files/                  -- added
         files/patch-build.xml   -- added

>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	Wed Jan 12 09:37:24 2005
+++ mysql-connector-java/Makefile	Wed Jan 12 14:25:34 2005
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	3.0.16
+PORTVERSION=	3.1.6
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
-DISTNAME=	${PORTNAME}-${PORTVERSION}-ga
 
 MAINTAINER=	m.seaman at infracaninophile.co.uk
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
+RUN_DEPENDS=	${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j
+
 .if !defined(WITHOUT_COMPILE)
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit
+BUILD_DEPENDS=	${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit \
+		${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j
+
 USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.4+
diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
--- /usr/ports/databases/mysql-connector-java/distinfo	Fri Nov 26 09:07:10 2004
+++ mysql-connector-java/distinfo	Wed Jan 12 11:40:08 2005
@@ -1,2 +1,2 @@
-MD5 (mysql-connector-java-3.0.16-ga.tar.gz) = 9b76101f74f1812013a695d156c71333
-SIZE (mysql-connector-java-3.0.16-ga.tar.gz) = 1087566
+MD5 (mysql-connector-java-3.1.6.tar.gz) = 0800a4fe488531346c368da93131eb31
+SIZE (mysql-connector-java-3.1.6.tar.gz) = 1601715
diff -Nur /usr/ports/databases/mysql-connector-java/files/patch-build.xml mysql-connector-java/files/patch-build.xml
--- /usr/ports/databases/mysql-connector-java/files/patch-build.xml	Thu Jan  1 01:00:00 1970
+++ mysql-connector-java/files/patch-build.xml	Wed Jan 12 13:03:17 2005
@@ -0,0 +1,14 @@
+--- build.xml~	Thu Dec 23 19:37:39 2004
++++ build.xml	Wed Jan 12 12:59:16 2005
+@@ -60,6 +60,11 @@
+ 			<include name="**/*.jar"/>
+ 		</fileset>
+ 
++		<fileset dir="/usr/local/share/java/classes">
++			<include name="junit.jar"/>
++			<include name="log4j.jar"/>
++		</fileset>
++
+ 		<pathelement location="${buildDir}/${fullProdName}" />
+ 	</path>
+ 
--- mysql-connector-java.diff ends here ---


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