From 768780a3d366e9e913973ced74d93037d02cd48b Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 13 Jan 2005 23:35:36 +0000
Subject: [ maintainer ] databases/mysql-connector-java -- update to 3.1.6

	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)

PR:		ports/76149
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk>
---
 databases/mysql-connector-java/Makefile              |  9 ++++++---
 databases/mysql-connector-java/distinfo              |  4 ++--
 databases/mysql-connector-java/files/patch-build.xml | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 databases/mysql-connector-java/files/patch-build.xml

(limited to 'databases/mysql-connector-java')

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 1e6b8f1782d2..d4e57b8a240e 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -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@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 --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 736c38122516..6b65938e27b2 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -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 --git a/databases/mysql-connector-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml
new file mode 100644
index 000000000000..1d4001d026f4
--- /dev/null
+++ b/databases/mysql-connector-java/files/patch-build.xml
@@ -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>
+ 
-- 
cgit v1.2.3