aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql-connector-java
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-10-24 09:15:43 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-10-24 09:15:43 +0000
commita9c768dcbafe2ebdc62d1641926e013b584538e8 (patch)
tree1087d5da6e6014d06e70313f953b4d6605e90c99 /databases/mysql-connector-java
parent82ef822ac695d2c53706182639f6751bb2d14c0b (diff)
downloadports-a9c768dcbafe2ebdc62d1641926e013b584538e8.tar.gz
ports-a9c768dcbafe2ebdc62d1641926e013b584538e8.zip
Notes
Diffstat (limited to 'databases/mysql-connector-java')
-rw-r--r--databases/mysql-connector-java/Makefile33
-rw-r--r--databases/mysql-connector-java/distinfo6
-rw-r--r--databases/mysql-connector-java/files/patch-build.xml19
3 files changed, 7 insertions, 51 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index eaab73db9875..8c90a0c58375 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql-connector-java
-PORTVERSION= 5.0.8
+PORTVERSION= 5.1.5
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Connector-J
@@ -16,26 +16,9 @@ COMMENT= MySQL Connector/J: JDBC interface for MySQL
RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-.if !defined(WITHOUT_COMPILE)
-
-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 dist
-MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
-BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
-
-.else
-
USE_JAVA= yes
JAVA_VERSION= 1.3+
BUILDDIR= ${WRKDIR}/${DISTNAME}
-
-.endif
-
APIDOCSDIR= ${DOCSDIR}/javadoc
SRCDIR= ${WRKDIR}/${DISTNAME}/src
JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
@@ -55,20 +38,12 @@ PORTDOCS= *
pre-fetch:
@${ECHO_MSG} ""
- @${ECHO_MSG} "You may use the following build options to override the"
- @${ECHO_MSG} "default behaviour:"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file"
- @${ECHO_MSG} ""
- @${ECHO_MSG} "This port requires JDK 1.4.x or better to compile, but the"
- @${ECHO_MSG} "JDBC driver can be made to operate with JVM 1.2.x or better"
+ @${ECHO_MSG} "Note: this port now installs the pre-compiled driver without"
+ @${ECHO_MSG} "the option of compiling from source, because compilation requires"
+ @${ECHO_MSG} "a mix of Java-5 and Java-6 that is not supported by bsd.java.mk"
@${ECHO_MSG} ""
-.if !defined(WITHOUT_COMPILE)
-post-build:
-.else
do-build:
-.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
${JAVADOC} -quiet -breakiterator \
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index d65870173dc4..d9fa5a4be775 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-connector-java-5.0.8.tar.gz) = 7a3caaa764fd6266bc312d8930972e8f
-SHA256 (mysql-connector-java-5.0.8.tar.gz) = 660a0e2a2c88a5fe65f1c5baadb20535095d367bc3688e7248a622f4e71ad68d
-SIZE (mysql-connector-java-5.0.8.tar.gz) = 8652406
+MD5 (mysql-connector-java-5.1.5.tar.gz) = 85289f74093a2b165d42f5ac38850d18
+SHA256 (mysql-connector-java-5.1.5.tar.gz) = 032be11733bf627467ac69e94ea94bdd472f1cf1fcf74e7c835235b3b2c35ba3
+SIZE (mysql-connector-java-5.1.5.tar.gz) = 8168212
diff --git a/databases/mysql-connector-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml
deleted file mode 100644
index 0a304d58a244..000000000000
--- a/databases/mysql-connector-java/files/patch-build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml.orig Mon Oct 10 15:59:00 2005
-+++ build.xml Tue Oct 18 09:45:11 2005
-@@ -60,12 +60,13 @@
- </path>
-
- <path id="project.build.classpath">
-- <fileset dir="${buildDir}/${fullProdName}/lib-nodist">
-+ <fileset dir="${buildDir}/${fullProdName}/lib">
- <include name="**/*.jar"/>
- </fileset>
-
-- <fileset dir="${buildDir}/${fullProdName}/lib">
-- <include name="**/*.jar"/>
-+ <fileset dir="${javalibdir}">
-+ <include name="junit.jar"/>
-+ <include name="log4j.jar"/>
- </fileset>
-
- <pathelement location="${buildDir}/${fullProdName}" />