From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 6 05:50:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27CE0106566C for ; Fri, 6 Jul 2012 05:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EA7068FC1F for ; Fri, 6 Jul 2012 05:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q665o2bh027082 for ; Fri, 6 Jul 2012 05:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q665o23s027081; Fri, 6 Jul 2012 05:50:02 GMT (envelope-from gnats) Resent-Date: Fri, 6 Jul 2012 05:50:02 GMT Resent-Message-Id: <201207060550.q665o23s027081@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C8191065673; Fri, 6 Jul 2012 05:45:50 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.dw.redsrci.com (mail.pub.dw.redsrci.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id 4B8DC8FC08; Fri, 6 Jul 2012 05:45:50 +0000 (UTC) Received: from mail.dw.redsrci.com (localhost [127.0.0.1]) by mail.dw.redsrci.com (Postfix) with ESMTP id D8385717E6D; Thu, 5 Jul 2012 22:45:44 -0700 (PDT) Received: from mail.dw.redsrci.com ([127.0.0.1]) by mail.dw.redsrci.com (mail.dw.redsrci.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0k7fOc4mFgr4; Thu, 5 Jul 2012 22:45:44 -0700 (PDT) Received: from experts-exchange.com (unknown [192.168.103.120]) by mail.dw.redsrci.com (Postfix) with SMTP id B2519717E6A; Thu, 5 Jul 2012 22:45:44 -0700 (PDT) Received: (nullmailer pid 83905 invoked by uid 1001); Fri, 06 Jul 2012 05:44:01 -0000 Message-Id: <1341553441.122296.83904.nullmailer@experts-exchange.com> Date: Thu, 05 Jul 2012 22:44:01 -0700 From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: matthew@FreeBSD.org Subject: ports/169675: [PATCH] databases/mysql-connector-java: drop CONFLICT on non-existent port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jul 2012 05:50:03 -0000 >Number: 169675 >Category: ports >Synopsis: [PATCH] databases/mysql-connector-java: drop CONFLICT on non-existent port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 06 05:50:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jason Helfman >Release: FreeBSD 8.3-RELEASE amd64 >Organization: >Environment: System: FreeBSD dormouse.experts-exchange.com 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr 9 21:23:18 UTC >Description: - drop conflict on non-existent port - shift license for portlint - explictly define PORTDOCS - drop use of non-default target in favor of standard options support Port maintainer (matthew@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS) >How-To-Repeat: >Fix: --- mysql-connector-java-5.1.17.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-connector-java/Makefile,v retrieving revision 1.62 diff -u -r1.62 Makefile --- Makefile 4 Jun 2012 19:25:54 -0000 1.62 +++ Makefile 6 Jul 2012 05:43:08 -0000 @@ -14,14 +14,12 @@ MAINTAINER= matthew@FreeBSD.org COMMENT= MySQL Connector/J: JDBC interface for MySQL +LICENSE= GPLv2 + RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j USE_ZIP= yes -CONFLICTS= mysql-connector-java*-5.0.* - -LICENSE= GPLv2 - USE_JAVA= yes JAVA_VERSION= 1.5+ BUILDDIR= ${WRKDIR}/${DISTNAME} @@ -37,9 +35,7 @@ .include -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * -.endif do-build: .if ${PORT_OPTIONS:MDOCS} @@ -49,14 +45,10 @@ com.mysql.jdbc org.gjt.mm.mysql) .endif -do-install: do-install-jar do-install-apidocs - -do-install-jar: +do-install: @${ECHO_MSG} -n ">> Installing .jar files..." @${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} @${ECHO_MSG} " [ DONE ]" - -do-install-apidocs: .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${APIDOCSDIR} --- mysql-connector-java-5.1.17.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: