ports/143052: [maintainer] databases/mysql-connector-java update to 5.1.11

[Matthew Seaman]

>Number:         143052
>Category:       ports
>Synopsis:       [maintainer] databases/mysql-connector-java update to 5.1.11
>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 Jan 21 08:50:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 8.0-STABLE FreeBSD 8.0-STABLE #17: Sun Jan 17 13:37:18 GMT 2010 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Routine update to version 5.1.11

ChangeLog is at: http://dev.mysql.com/doc/refman/5.0/en/cj-news-5-1-11.html

Also:

   Delete two extra .jar files from plist: these are no longer bundled
   with MySQL Connector/J

   Delete an old informational message

   Reorder a few statements to placate portlint(1)

>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	2009-12-02 20:53:07.000000000 +0000
+++ mysql-connector-java/Makefile	2010-01-21 08:35:11.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.10
+PORTVERSION=	5.1.11
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
@@ -14,10 +14,10 @@
 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
 
+CONFLICTS=	mysql-connector-java*-5.0.*
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 BUILDDIR=	${WRKDIR}/${DISTNAME}
@@ -25,26 +25,16 @@
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
 JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
 DESTJARFILE=	${PORTNAME}.jar
-EXTRAJARS=	jdbc2_0-stdext.jar jta-spec1_0_1.jar
 EXTRADOCS=	README CHANGES docs/connector-j.html docs/connector-j.pdf
 JARFILE=	${DISTNAME}-bin.jar
-JDCLASSPATH=	${SRCDIR}:${SRCDIR}/lib/jdbc2_0-stdext.jar:${SRCDIR}/lib/jta-spec1_0_1.jar:${CLASSPATH}
+JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
 
-PLIST_FILES=	%%JAVAJARDIR%%/jdbc2_0-stdext.jar \
-		%%JAVAJARDIR%%/jta-spec1_0_1.jar  \
-		%%JAVAJARDIR%%/${DESTJARFILE}
+PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Note: this port now installs the pre-compiled driver without"
-	@${ECHO_MSG} "the option of compiling from source, because compilation requires"
-	@${ECHO_MSG} "a mix of Java-5 and Java-6 that is not supported by bsd.java.mk"
-	@${ECHO_MSG} ""
-
 do-build:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
@@ -59,9 +49,6 @@
 do-install-jar:
 	@${ECHO_MSG} -n ">> Installing .jar files..."
 	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@for extrajar in ${EXTRAJARS} ; do                                     \
-	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/lib/$$extrajar ${JAVAJARDIR} ; \
-	done
 	@${ECHO_MSG} " [ DONE ]"
 
 do-install-apidocs:
diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
--- /usr/ports/databases/mysql-connector-java/distinfo	2009-12-02 20:53:07.000000000 +0000
+++ mysql-connector-java/distinfo	2010-01-21 08:24:02.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (mysql-connector-java-5.1.10.tar.gz) = f9da616de868ddd1acf1428334f3313d
-SHA256 (mysql-connector-java-5.1.10.tar.gz) = d156857f85737d7cca5d8ab9ba77e2809756c94b2e9a40bc333e08a00da8e1e8
-SIZE (mysql-connector-java-5.1.10.tar.gz) = 3666173
+MD5 (mysql-connector-java-5.1.11.tar.gz) = 22630172e67c1a96996c3201d9b30398
+SHA256 (mysql-connector-java-5.1.11.tar.gz) = ad1522b5d35cd3c599008c3e5f5297797def115c310c3b66b4a07eed8ace14a7
+SIZE (mysql-connector-java-5.1.11.tar.gz) = 3735062
--- mysql-connector-java.diff ends here ---


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