From b030baf14cbc55682bbf58a9e4d2b42396516d3b Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Sat, 21 May 2011 20:01:41 +0000
Subject: Update to 5.1.15

PR:		156443
Submitted by:	maintainer
---
 databases/mysql-connector-java/Makefile | 15 ++++++++-------
 databases/mysql-connector-java/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 8189b83ed973..323e6945f9e6 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.12
+PORTVERSION=	5.1.15
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
@@ -18,6 +18,8 @@ RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
 
 CONFLICTS=	mysql-connector-java*-5.0.*
 
+LICENSE=	GPLv2
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 BUILDDIR=	${WRKDIR}/${DISTNAME}
@@ -25,7 +27,7 @@ APIDOCSDIR=	${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
 JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
 DESTJARFILE=	${PORTNAME}.jar
-EXTRADOCS=	README CHANGES docs/connector-j.html docs/connector-j.pdf
+EXTRADOCS=	CHANGES docs/connector-j.html docs/connector-j.pdf
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
 
@@ -37,11 +39,10 @@ PORTDOCS=	*
 
 do-build:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
-	    ${JAVADOC} -quiet -breakiterator      \
-		-d ${JAVADOCDIR} -package         \
-	        -classpath  ${JDCLASSPATH}        \
-	         com.mysql.jdbc org.gjt.mm.mysql)
+	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
+	    ${JAVADOC} -quiet -breakiterator -encoding utf8     \
+	    -d ${JAVADOCDIR} -package -classpath ${JDCLASSPATH}	\
+	    com.mysql.jdbc org.gjt.mm.mysql)
 .endif
 
 do-install: do-install-jar do-install-apidocs
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 7574d9b0ed24..4885a7f03daf 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-java-5.1.12.tar.gz) = afc4f84eccbfaed92cd711549581971fc27e93b3318d4fa1f5b53a2f58f8d0f0
-SIZE (mysql-connector-java-5.1.12.tar.gz) = 3740147
+SHA256 (mysql-connector-java-5.1.15.tar.gz) = 6db61abe733fc074215a50abb6db81c34eae193a8825a832a46dd05a9e566fce
+SIZE (mysql-connector-java-5.1.15.tar.gz) = 3304179
-- 
cgit v1.2.3