From matthew@thebunker.net  Tue Feb 22 10:13:57 2005
Return-Path: <matthew@thebunker.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BFF4916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 10:13:57 +0000 (GMT)
Received: from male.aldigital.co.uk (male.thebunker.net [213.129.64.13])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA6243D66
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 10:13:57 +0000 (GMT)
	(envelope-from matthew@thebunker.net)
Received: from gravitas.thebunker.net (gateway.ash.thebunker.net [213.129.64.4])
	(using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits))
	(No client certificate requested)
	by male.aldigital.co.uk (Postfix) with ESMTP id 3DEFA9767D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 10:13:56 +0000 (GMT)
Received: from gravitas.thebunker.net (localhost [127.0.0.1])
	by gravitas.thebunker.net (8.13.1/8.13.1) with ESMTP id j1MADprm007524
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 10:13:51 GMT
	(envelope-from matthew@gravitas.thebunker.net)
Received: (from matthew@localhost)
	by gravitas.thebunker.net (8.13.1/8.13.1/Submit) id j1MADpIc007523;
	Tue, 22 Feb 2005 10:13:51 GMT
	(envelope-from matthew)
Message-Id: <200502221013.j1MADpIc007523@gravitas.thebunker.net>
Date: Tue, 22 Feb 2005 10:13:51 GMT
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ maintainer ] databases/mysql-connector-java -- update to 3.1.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77916
>Category:       ports
>Synopsis:       [ maintainer ] databases/mysql-connector-java -- update to 3.1.7
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 22 10:20:17 GMT 2005
>Closed-Date:    Tue Feb 22 21:18:38 GMT 2005
>Last-Modified:  Tue Feb 22 21:18:38 GMT 2005
>Originator:     Matthew Seaman
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD gravitas.thebunker.net 5.3-STABLE FreeBSD 5.3-STABLE #7: Mon Feb 14 23:07:43 GMT 2005 root@gravitas.thebunker.net:/usr/obj/usr/src/sys/GRAVITAS i386


	
>Description:

Routine update to version 3.1.7.  Release announcement is at:

    http://lists.mysql.com/announce/260

>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	Fri Jan 14 09:39:04 2005
+++ mysql-connector-java/Makefile	Tue Feb 22 09:42:58 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	3.1.6
+PORTVERSION=	3.1.7
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
diff -Nur /usr/ports/databases/mysql-connector-java/distinfo mysql-connector-java/distinfo
--- /usr/ports/databases/mysql-connector-java/distinfo	Fri Jan 14 09:39:04 2005
+++ mysql-connector-java/distinfo	Tue Feb 22 09:43:14 2005
@@ -1,2 +1,2 @@
-MD5 (mysql-connector-java-3.1.6.tar.gz) = 0800a4fe488531346c368da93131eb31
-SIZE (mysql-connector-java-3.1.6.tar.gz) = 1601715
+MD5 (mysql-connector-java-3.1.7.tar.gz) = 3ce0ff78bc399e5e1d2686596e5ab4e1
+SIZE (mysql-connector-java-3.1.7.tar.gz) = 1651792
--- mysql-connector-java.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hq 
Responsible-Changed-By: hq 
Responsible-Changed-When: Tue Feb 22 10:40:19 GMT 2005 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77916 
State-Changed-From-To: open->feedback 
State-Changed-By: hq 
State-Changed-When: Tue Feb 22 14:08:21 GMT 2005 
State-Changed-Why:  
While we are here, could you please review the following patch? It has your 
changes and the following: 

- Use ${JAVALIBDIR} for JAR dependencies 
- Use %%JAVAJARDIR%% in plist 
- ECHO_CMD -> ECHO_MSG 
- Add $FreeBSD$ tag in patch 
- Imroved the build.xml patch to have the location of JAR files set through 
MAKE_ARGS (should help with people with non-standard paths) 


Index: Makefile 
=================================================================== 
RCS file: /home/ncvs/ports/databases/mysql-connector-java/Makefile,v 
retrieving revision 1.30 
diff -u -r1.30 Makefile 
--- Makefile	13 Jan 2005 23:35:36 -0000	1.30 
+++ Makefile	22 Feb 2005 14:05:34 -0000 
@@ -6,7 +6,7 @@ 
# 

PORTNAME=	mysql-connector-java 
-PORTVERSION=	3.1.6 
+PORTVERSION=	3.1.7 
CATEGORIES=	databases java 
MASTER_SITES=	${MASTER_SITE_MYSQL} 
MASTER_SITE_SUBDIR=	Connector-J 
@@ -14,17 +14,18 @@ 
MAINTAINER=	m.seaman@infracaninophile.co.uk 
COMMENT=	MySQL Connector/J: JDBC interface for MySQL 

-RUN_DEPENDS=	${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j 
+RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j 

.if !defined(WITHOUT_COMPILE) 

-BUILD_DEPENDS=	${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit  
-		${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j 
+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 compile-driver 
+MAKE_ARGS=	-Djavajardir=${JAVAJARDIR} 
BUILDDIR=	${WRKDIR}/build-mysql-jdbc/${DISTNAME} 

.else 
@@ -42,9 +43,9 @@ 
JARFILE=	${DISTNAME}-bin.jar 
JDCLASSPATH=	${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} 

-PLIST_FILES=	share/java/classes/jdbc2_0-stdext.jar  
-		share/java/classes/jta-spec1_0_1.jar  
-		share/java/classes/mysql-connector-java.jar 
+PLIST_FILES=	%%JAVAJARDIR%%/jdbc2_0-stdext.jar  
+		%%JAVAJARDIR%%/jta-spec1_0_1.jar  
+		%%JAVAJARDIR%%/mysql-connector-java.jar 

.if !defined(NOPORTDOCS) 
PORTDOCS=	* 
@@ -75,23 +76,23 @@ 
do-install: do-install-jar do-install-apidocs 

do-install-jar: 
-	@${ECHO_CMD} -n ">> Installing .jar files..." 
+	@${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} ;  
done 
-	@${ECHO_CMD} " [ DONE ]" 
+	@${ECHO_MSG} " [ DONE ]" 

do-install-apidocs: 
.if !defined(NOPORTDOCS) 
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." 
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." 
@${MKDIR} ${APIDOCSDIR} 
@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR} 
@for extradoc in ${EXTRADOCS} ; do                     
${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ;  
done 
-	@${ECHO_CMD} " [ DONE ]" 
+	@${ECHO_MSG} " [ DONE ]" 
.endif 

.include <bsd.port.mk> 
Index: distinfo 
=================================================================== 
RCS file: /home/ncvs/ports/databases/mysql-connector-java/distinfo,v 
retrieving revision 1.13 
diff -u -r1.13 distinfo 
--- distinfo	13 Jan 2005 23:35:36 -0000	1.13 
+++ distinfo	22 Feb 2005 14:05:34 -0000 
@@ -1,2 +1,2 @@ 
-MD5 (mysql-connector-java-3.1.6.tar.gz) = 0800a4fe488531346c368da93131eb31 
-SIZE (mysql-connector-java-3.1.6.tar.gz) = 1601715 
+MD5 (mysql-connector-java-3.1.7.tar.gz) = 3ce0ff78bc399e5e1d2686596e5ab4e1 
+SIZE (mysql-connector-java-3.1.7.tar.gz) = 1651792 
Index: files/patch-build.xml 
=================================================================== 
RCS file: /home/ncvs/ports/databases/mysql-connector-java/files/patch-build.xml,v 
retrieving revision 1.3 
diff -u -r1.3 patch-build.xml 
--- files/patch-build.xml	13 Jan 2005 23:35:36 -0000	1.3 
+++ files/patch-build.xml	22 Feb 2005 14:05:34 -0000 
@@ -4,7 +4,7 @@ 
<include name="**/*.jar"/> 
</fileset> 

-+		<fileset dir="/usr/local/share/java/classes"> 
++		<fileset dir="${javajardir}"> 
+			<include name="junit.jar"/> 
+			<include name="log4j.jar"/> 
+		</fileset> 



http://www.freebsd.org/cgi/query-pr.cgi?pr=77916 
State-Changed-From-To: feedback->closed 
State-Changed-By: hq 
State-Changed-When: Tue Feb 22 21:17:53 GMT 2005 
State-Changed-Why:  
Patch commited with maintainer approved changes. 

Thanks for your contribution! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77916 
>Unformatted:
