summaryrefslogtreecommitdiff
path: root/databases/mysql-connector-java
diff options
context:
space:
mode:
authorMatthew Seaman <matthew@FreeBSD.org>2012-07-10 05:17:42 +0000
committerMatthew Seaman <matthew@FreeBSD.org>2012-07-10 05:17:42 +0000
commita24712b4bf9af04702a4dae8c96c00228b908869 (patch)
treef0b1a80963cdcaf78231cbce469dc9a87ce040e7 /databases/mysql-connector-java
parentRoutine bugfix update to 3.5.2 (diff)
Remove redundant CONFLICTs setting
Reposition LICENSE to pacify portlint Submitted by: jgh PR: ports/169675 Approved by: shaun (mentor)
Diffstat (limited to 'databases/mysql-connector-java')
-rw-r--r--databases/mysql-connector-java/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index cdc0fa985aea..5c81893adda7 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -14,14 +14,11 @@ MASTER_SITE_SUBDIR= Connector-J
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}