Attachment 58226 Details for Bug 87797 – mysql-connector-java.diff

[patch] mysql-connector-java.diff

mysql-connector-java.diff (text/plain), 2.79 KB, created by Matthew Seaman on 2005-10-21 18:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2005-10-21 18:50:01 UTC

Size: 2.79 KB

patch

obsolete

>diff -Nur /usr/ports/databases/mysql-connector-java/Makefile mysql-connector-java/Makefile
>--- /usr/ports/databases/mysql-connector-java/Makefile	Thu Sep 15 08:05:10 2005
>+++ mysql-connector-java/Makefile	Tue Oct 18 19:27:27 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mysql-connector-java
>-PORTVERSION=	3.1.10
>+PORTVERSION=	3.1.11
> CATEGORIES=	databases java
> MASTER_SITES=	${MASTER_SITE_MYSQL}
> MASTER_SITE_SUBDIR=	Connector-J
>@@ -41,7 +41,7 @@
> JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
> DESTJARFILE=	${PORTNAME}.jar
> EXTRAJARS=	jdbc2_0-stdext.jar jta-spec1_0_1.jar
>-EXTRADOCS=	README CHANGES docs/index.html docs/connector-j-en.pdf
>+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}
> 
>@@ -55,7 +55,8 @@
> 
> pre-fetch:
> 	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "You may use the following build options:"
>+	@${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} ""
>diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
>--- /usr/ports/databases/mysql-connector-java/distinfo	Thu Jul  7 08:37:50 2005
>+++ mysql-connector-java/distinfo	Tue Oct 18 09:42:41 2005
>@@ -1,2 +1,2 @@
>-MD5 (mysql-connector-java-3.1.10.tar.gz) = 337f7f31e726fb615d3f4f062030d1b5
>-SIZE (mysql-connector-java-3.1.10.tar.gz) = 6892037
>+MD5 (mysql-connector-java-3.1.11.tar.gz) = 0f6296a75126b67cfcdd06df28804309
>+SIZE (mysql-connector-java-3.1.11.tar.gz) = 7994374
>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	Thu Jul  7 08:37:50 2005
>+++ mysql-connector-java/files/patch-build.xml	Tue Oct 18 19:07:04 2005
>@@ -1,10 +1,8 @@
>-$FreeBSD: ports/databases/mysql-connector-java/files/patch-build.xml,v 1.6 2005/07/06 16:10:23 hq Exp $
>-
>---- build.xml.orig	Thu Jun 23 00:29:13 2005
>-+++ build.xml	Tue Jul  5 23:08:11 2005
>-@@ -57,12 +57,13 @@
>+--- 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">
>@@ -19,12 +17,3 @@
>  		</fileset>
>  
>  		<pathelement location="${buildDir}/${fullProdName}" />
>-@@ -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">

Actions: View | Diff

Attachments on bug 87797: 58226