Date: Wed, 6 Jul 2005 13:12:21 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83059: [maintainer] databases/mysql-connector-java update to 3.1.10 Message-ID: <200507061212.j66CCLfc056904@lack-of-gravitas.thebunker.net> Resent-Message-ID: <200507061220.j66CKLn4068334@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83059
>Category: ports
>Synopsis: [maintainer] databases/mysql-connector-java update to 3.1.10
>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: Wed Jul 06 12:20:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 5.4-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD lack-of-gravitas.thebunker.net 5.4-STABLE FreeBSD 5.4-STABLE #7: Thu Jun 30 18:41:52 BST 2005 root@lack-of-gravitas.thebunker.net:/usr/obj/usr/src/sys/LACK-OF-GRAVITAS i386
>Description:
Upgrade to version 3.1.10. The diff is fairly large, as the build
process has been extensively recoded upstream. Also install some of
the pre-built documentation, either as .html or as .pdf
>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 Sat Apr 23 11:51:58 2005
+++ mysql-connector-java/Makefile Tue Jul 5 23:25:39 2005
@@ -6,7 +6,7 @@
#
PORTNAME= mysql-connector-java
-PORTVERSION= 3.1.8
+PORTVERSION= 3.1.10
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Connector-J
@@ -24,9 +24,9 @@
USE_JAVA= yes
USE_ANT= yes
JAVA_VERSION= 1.4+
-ALL_TARGET= clean compile-driver
+ALL_TARGET= clean dist
MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
-BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}
+BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
.else
@@ -37,14 +37,16 @@
.endif
APIDOCSDIR= ${DOCSDIR}/javadoc
+SRCDIR= ${WRKDIR}/${DISTNAME}/src
+JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
DESTJARFILE= ${PORTNAME}.jar
EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar
-EXTRADOCS= README CHANGES
+EXTRADOCS= README CHANGES docs/index.html docs/connector-j-en.pdf
JARFILE= ${DISTNAME}-bin.jar
-JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
+JDCLASSPATH= ${SRCDIR}:${SRCDIR}/lib/jdbc2_0-stdext.jar:${SRCDIR}/lib/jta-spec1_0_1.jar:${CLASSPATH}
PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \
- %%JAVAJARDIR%%/jta-spec1_0_1.jar \
+ %%JAVAJARDIR%%/jta-spec1_0_1.jar \
%%JAVAJARDIR%%/mysql-connector-java.jar
.if !defined(NOPORTDOCS)
@@ -67,9 +69,9 @@
do-build:
.endif
.if !defined(NOPORTDOCS)
- @${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \
- ${JAVADOC} -d ${BUILDDIR}/doc -package \
- -classpath ${JDCLASSPATH} \
+ @${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
+ ${JAVADOC} -d ${JAVADOCDIR} -package \
+ -classpath ${JDCLASSPATH} \
com.mysql.jdbc org.gjt.mm.mysql)
.endif
@@ -79,8 +81,8 @@
@${ECHO_MSG} -n ">> Installing .jar files..."
@${MKDIR} ${JAVAJARDIR}
@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
- @for extrajar in ${EXTRAJARS} ; do \
- ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \
+ @for extrajar in ${EXTRAJARS} ; do \
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/lib/$$extrajar ${JAVAJARDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
@@ -88,9 +90,9 @@
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${APIDOCSDIR}
- @${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}
- @for extradoc in ${EXTRADOCS} ; do \
- ${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \
+ @${CP} -r ${JAVADOCDIR}/* ${APIDOCSDIR}
+ @for extradoc in ${EXTRADOCS} ; do \
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${DOCSDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
.endif
diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
--- /usr/ports/databases/mysql-connector-java/distinfo Sat Apr 23 04:15:00 2005
+++ mysql-connector-java/distinfo Tue Jul 5 21:44:43 2005
@@ -1,2 +1,2 @@
-MD5 (mysql-connector-java-3.1.8.tar.gz) = d1c2b08184290e34c2c9a82945e257b2
-SIZE (mysql-connector-java-3.1.8.tar.gz) = 7490467
+MD5 (mysql-connector-java-3.1.10.tar.gz) = 337f7f31e726fb615d3f4f062030d1b5
+SIZE (mysql-connector-java-3.1.10.tar.gz) = 6892037
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 Sat Apr 23 11:51:59 2005
+++ mysql-connector-java/files/patch-build.xml Tue Jul 5 23:09:15 2005
@@ -1,14 +1,28 @@
---- build.xml~ Thu Dec 23 19:37:39 2004
-+++ build.xml Wed Jan 12 12:59:16 2005
-@@ -60,6 +60,11 @@
+--- build.xml.orig Thu Jun 23 00:29:13 2005
++++ build.xml Tue Jul 5 23:08:11 2005
+@@ -57,12 +57,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>
-+
+ </fileset>
+
<pathelement location="${buildDir}/${fullProdName}" />
- </path>
+@@ -253,7 +254,7 @@
+ includes="**/*.class,**/*.properties*,COPYING,README"
+ excludes="testsuite/**"
+ index="true"
+- manifest="${buildDir}/MANIFEST.MF"/>
++ manifest="${buildDir}/META-INF/MANIFEST.MF"/>
+ </target>
+ <target name="dist-trace" depends="init, compile-driver-trace">
--- 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?200507061212.j66CCLfc056904>