Date: Mon, 15 Oct 2007 20:02:54 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: miwi@FreeBSD.org Subject: ports/117219: [maintiner] databases/mysql-connector-java Message-ID: <200710151902.l9FJ2sRQ094813@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <200710151910.l9FJA1wM022214@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117219
>Category: ports
>Synopsis: [maintiner] databases/mysql-connector-java
>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: Mon Oct 15 19:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 6.2-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 6.2-STABLE FreeBSD 6.2-STABLE #10: Sun Oct 7 13:05:09 BST 2007 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
This is a major upgrade to the new 5.1 GA branch, introducing
significant new functionality including support for the new JDBC-4.0
API. Users are advised to test carefully before upgrading production
environments.
The port can unfortunately no-longer offer the option of compiling the
driver from source. Compiling the driver requires a capability to
deal with a mixture of Java-5 and Java-6 APIs that the bsd.java.mk
framework is not currently able to provide. Instead the port now
simply installs the pre-compiled driver provided by MySQL.
Given the major differences in functionality, and the fact that
mysql-connector-java-5.0.8 (which was released simultaneously with
5.1.5) hasn't been in the ports tree very long, and as previously
requested in PR ports/117060, I'd like to have
databases/mysql-connector-java repo-copied to
databases/mysql-connector-java50 -- this port will continue to provide
version 5.0.8 -- before databases/mysql-connector-java is updated to
5.1.5 as per this PR.
Note for commiters:
Removed file: files/patch-build.xml
Removed directory: files
>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 2007-10-15 19:23:18.000000000 +0100
+++ mysql-connector-java/Makefile 2007-10-15 19:32:45.000000000 +0100
@@ -2,11 +2,11 @@
# Date created: 8 October 2003
# Whom: Matthew Seaman <m.seaman@infracaninophile.co.uk>
#
-# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.46 2007/10/12 23:49:21 miwi Exp $
+# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.45 2007/10/02 21:17:32 hq Exp $
#
PORTNAME= mysql-connector-java
-PORTVERSION= 5.0.8
+PORTVERSION= 5.1.5
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Connector-J
@@ -16,26 +16,9 @@
RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-.if !defined(WITHOUT_COMPILE)
-
-BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
- ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-
-USE_JAVA= yes
-USE_ANT= yes
-JAVA_VERSION= 1.4+
-ALL_TARGET= clean dist
-MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
-BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
-
-.else
-
USE_JAVA= yes
JAVA_VERSION= 1.3+
BUILDDIR= ${WRKDIR}/${DISTNAME}
-
-.endif
-
APIDOCSDIR= ${DOCSDIR}/javadoc
SRCDIR= ${WRKDIR}/${DISTNAME}/src
JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
@@ -55,20 +38,12 @@
pre-fetch:
@${ECHO_MSG} ""
- @${ECHO_MSG} "You may use the following build options to override the"
- @${ECHO_MSG} "default behaviour:"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file"
- @${ECHO_MSG} ""
- @${ECHO_MSG} "This port requires JDK 1.4.x or better to compile, but the"
- @${ECHO_MSG} "JDBC driver can be made to operate with JVM 1.2.x or better"
+ @${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} ""
-.if !defined(WITHOUT_COMPILE)
-post-build:
-.else
do-build:
-.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
${JAVADOC} -quiet -breakiterator \
diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
--- /usr/ports/databases/mysql-connector-java/distinfo 2007-10-15 19:23:18.000000000 +0100
+++ mysql-connector-java/distinfo 2007-10-09 17:12:00.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (mysql-connector-java-5.0.8.tar.gz) = 7a3caaa764fd6266bc312d8930972e8f
-SHA256 (mysql-connector-java-5.0.8.tar.gz) = 660a0e2a2c88a5fe65f1c5baadb20535095d367bc3688e7248a622f4e71ad68d
-SIZE (mysql-connector-java-5.0.8.tar.gz) = 8652406
+MD5 (mysql-connector-java-5.1.5.tar.gz) = 85289f74093a2b165d42f5ac38850d18
+SHA256 (mysql-connector-java-5.1.5.tar.gz) = 032be11733bf627467ac69e94ea94bdd472f1cf1fcf74e7c835235b3b2c35ba3
+SIZE (mysql-connector-java-5.1.5.tar.gz) = 8168212
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 2005-10-22 13:50:56.000000000 +0100
+++ mysql-connector-java/files/patch-build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- build.xml.orig Mon Oct 10 15:59:00 2005
-+++ build.xml Tue Oct 18 09:45:11 2005
-@@ -60,12 +60,13 @@
- </path>
-
- <path id="project.build.classpath">
-- <fileset dir="${buildDir}/${fullProdName}/lib-nodist">
-+ <fileset dir="${buildDir}/${fullProdName}/lib">
- <include name="**/*.jar"/>
- </fileset>
-
-- <fileset dir="${buildDir}/${fullProdName}/lib">
-- <include name="**/*.jar"/>
-+ <fileset dir="${javalibdir}">
-+ <include name="junit.jar"/>
-+ <include name="log4j.jar"/>
- </fileset>
-
- <pathelement location="${buildDir}/${fullProdName}" />
--- mysql-connector-java.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710151902.l9FJ2sRQ094813>