[63017] trunk/dports/java/mysql-connector-java

[nox at macports.org]

Revision: 63017
          http://trac.macports.org/changeset/63017
Author:   nox at macports.org
Date:     2010-01-23 08:34:19 -0800 (Sat, 23 Jan 2010)
Log Message:
-----------
Update mysql-connector-java to 5.1.11

Modified Paths:
--------------
    trunk/dports/java/mysql-connector-java/Portfile
    trunk/dports/java/mysql-connector-java/files/patch-JDK-1.6.diff

Modified: trunk/dports/java/mysql-connector-java/Portfile
===================================================================
--- trunk/dports/java/mysql-connector-java/Portfile	2010-01-23 16:34:04 UTC (rev 63016)
+++ trunk/dports/java/mysql-connector-java/Portfile	2010-01-23 16:34:19 UTC (rev 63017)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name				mysql-connector-java
-version				5.1.10
+version				5.1.11
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories			java
@@ -22,9 +22,9 @@
 homepage			http://dev.mysql.com/doc/refman/${branch}/en/connector-j.html
 
 master_sites		http://ftp.plusline.de/mysql/Downloads/Connector-J/
-checksums           md5     f9da616de868ddd1acf1428334f3313d \
-                    sha1    32938f3004c70a657a7481496bc3813b85df20de \
-                    rmd160  ef5b6cf4cceaac0c6d32858920c362bab6004bc1
+checksums           md5     22630172e67c1a96996c3201d9b30398 \
+                    sha1    0183a6b52cfdb935826590f667e5272f6fffe943 \
+                    rmd160  53c048d215bee69f35d3f8335bd61328d734ff21
 
 patchfiles			patch-build.xml
 
@@ -44,11 +44,15 @@
 					-Dlog4j.jar=${javaLibs}/jakarta-log4j.jar					
 
 destroot {
-	xinstall -m 755 -d ${destroot}${prefix}/share/java \
+	xinstall -d ${destroot}${prefix}/share/java \
 		${destroot}${prefix}/share/doc
 	xinstall -m 644 ${worksrcpath}/build/${distname}/${distname}-bin.jar \
 		${destroot}${prefix}/share/java/${name}-5.0.jar
-	file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
+	copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
+
+    set docdir ${prefix}/share/doc/${name}
+    xinstall -m 644 -W ${worksrcpath} CHANGES COPYING EXCEPTIONS-CONNECTOR-J \
+        ${destroot}${docdir}
 }
 
 platform darwin 10 {

Modified: trunk/dports/java/mysql-connector-java/files/patch-JDK-1.6.diff
===================================================================
--- trunk/dports/java/mysql-connector-java/files/patch-JDK-1.6.diff	2010-01-23 16:34:04 UTC (rev 63016)
+++ trunk/dports/java/mysql-connector-java/files/patch-JDK-1.6.diff	2010-01-23 16:34:19 UTC (rev 63017)
@@ -1866,7 +1866,7 @@
  //			if (this.wrappedStmt != null) {
 --- src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java.orig	2009-11-28 18:58:49.000000000 +0100
 +++ src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2009-11-29 01:26:55.000000000 +0100
-@@ -25,10 +25,18 @@
+@@ -25,9 +25,16 @@
  package com.mysql.jdbc.jdbc2.optional;
  
  import java.lang.reflect.Constructor;
@@ -1881,13 +1881,11 @@
  import java.sql.Statement;
 +import java.sql.Struct;
  import java.util.Map;
-+import java.util.Properties;
+ import java.util.Properties;
  import java.util.TimeZone;
- 
- import com.mysql.jdbc.Connection;
 @@ -2619,4 +2627,58 @@
- 			boolean queryTimeoutKillsConnection) {
- 		this.mc.setQueryTimeoutKillsConnection(queryTimeoutKillsConnection);
+ 	public Properties getProperties() {
+ 		return this.mc.getProperties();
  	}
 +
 +	public boolean isValid(int timeout) throws SQLException {
@@ -1944,6 +1942,7 @@
 +		throw SQLError.notImplemented();
 +	}
  }
+\ No newline at end of file
 --- src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java.orig	2009-11-28 18:58:49.000000000 +0100
 +++ src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java	2009-11-29 01:15:15.000000000 +0100
 @@ -38,6 +38,7 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100123/587d6dc8/attachment-0001.html>