ports/169675: [PATCH] databases/mysql-connector-java: drop CONFLICT on non-existent port

[Jason Helfman]

>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 at 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 at 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 <bsd.port.options.mk>
 
-.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: