From m.seaman@infracaninophile.co.uk  Thu May 21 07:32:46 2009
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F191E106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 May 2009 07:32:46 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (gate6.infracaninophile.co.uk [IPv6:2001:8b0:151:1::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 67CE98FC1F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 May 2009 07:32:46 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.14.3/8.14.3) with ESMTP id n4L7WeOf024055
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 May 2009 08:32:40 +0100 (BST)
	(envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by happy-idiot-talk.infracaninophile.co.uk (8.14.3/8.14.3/Submit) id n4L7Weot024054;
	Thu, 21 May 2009 08:32:40 +0100 (BST)
	(envelope-from matthew)
Message-Id: <200905210732.n4L7Weot024054@happy-idiot-talk.infracaninophile.co.uk>
Date: Thu, 21 May 2009 08:32:40 +0100 (BST)
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-java50 -- fix LATEST_LINK, conflicts
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         134777
>Category:       ports
>Synopsis:       [maintainer] databases/mysql-connector-java50 -- fix LATEST_LINK, conflicts
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    laszlof
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 21 07:40:01 UTC 2009
>Closed-Date:    Thu May 21 12:08:31 UTC 2009
>Last-Modified:  Thu May 21 12:10:03 UTC 2009
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.2-PRERELEASE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #60: Sun Mar 29 22:33:09 BST 2009 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Per pav's recent e-mail to freebsd-ports@..., fix latest link for
mysql-connector-java50.  While I'm here, add a conflicts line to
mysql-connector-java.

>How-To-Repeat:
	
>Fix:

	

--- mysql-connector-java50.diff begins here ---
diff -Nur /usr/ports/databases/mysql-connector-java50/Makefile mysql-connector-java50/Makefile
--- /usr/ports/databases/mysql-connector-java50/Makefile	2008-08-24 11:53:59.000000000 +0100
+++ mysql-connector-java50/Makefile	2009-05-21 07:37:02.000000000 +0100
@@ -5,18 +5,21 @@
 # $FreeBSD: ports/databases/mysql-connector-java50/Makefile,v 1.49 2008/08/22 14:33:12 pav Exp $
 #
 
-PORTNAME=	mysql-connector-java
+PORTNAME=	mysql-connector-java50
 PORTVERSION=	5.0.8
 PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
+DISTNAME=	${PORTNAME:S/50//}-${DISTVERSION}
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
 RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
 
+CONFLICTS=	mysql-connector-java-5.1.*
+
 .if !defined(WITHOUT_COMPILE)
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
@@ -40,7 +43,7 @@
 APIDOCSDIR=	${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
 JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
-DESTJARFILE=	${PORTNAME}.jar
+DESTJARFILE=	${PORTNAME:S/50//}.jar
 EXTRAJARS=	jdbc2_0-stdext.jar jta-spec1_0_1.jar
 EXTRADOCS=	README CHANGES docs/connector-j.html docs/connector-j.pdf
 JARFILE=	${DISTNAME}-bin.jar
@@ -48,7 +51,7 @@
 
 PLIST_FILES=	%%JAVAJARDIR%%/jdbc2_0-stdext.jar \
 		%%JAVAJARDIR%%/jta-spec1_0_1.jar  \
-		%%JAVAJARDIR%%/mysql-connector-java.jar
+		%%JAVAJARDIR%%/${DESTJARFILE}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
--- mysql-connector-java50.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->laszlof 
Responsible-Changed-By: laszlof 
Responsible-Changed-When: Thu May 21 12:02:40 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134777 
State-Changed-From-To: open->closed 
State-Changed-By: laszlof 
State-Changed-When: Thu May 21 12:08:31 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134777 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/134777: commit references a PR
Date: Thu, 21 May 2009 12:08:59 +0000 (UTC)

 laszlof     2009-05-21 12:08:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/mysql-connector-java50 Makefile 
   Log:
   - Fix latest link
   - Added conflict for mysql java connector 5.1
   
   PR:                     ports/134777
   Submitted by:           Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
   
   Revision  Changes    Path
   1.50      +6 -3      ports/databases/mysql-connector-java50/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
