- Update to 3.1.7 [1]

- Use ${JAVALIBDIR} for JAR dependencies
- Use %%JAVAJARDIR%% in plist
- ECHO_CMD -> ECHO_MSG
- Add $FreeBSD$ tag in patch
- Improve the build.xml patch to have the location of JAR files set through
  MAKE_ARGS (should help with people with non-standard paths)

PR:		77916 [1]
Submitted by:	maintainer [1]
Approved by:	maintainer

3 files changed, 15 insertions, 14 deletions

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index d4e57b8a240e..1a54f3041861 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	3.1.6
+PORTVERSION=	3.1.7
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
@@ -14,17 +14,18 @@ MASTER_SITE_SUBDIR=	Connector-J
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
-RUN_DEPENDS=	${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j
+RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
 
 .if !defined(WITHOUT_COMPILE)
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit \
-		${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j
+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 compile-driver
+MAKE_ARGS=	-Djavajardir=${JAVAJARDIR}
 BUILDDIR=	${WRKDIR}/build-mysql-jdbc/${DISTNAME}
 
 .else
@@ -42,9 +43,9 @@ EXTRADOCS=	README CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
 
-PLIST_FILES=	share/java/classes/jdbc2_0-stdext.jar \
-		share/java/classes/jta-spec1_0_1.jar \
-		share/java/classes/mysql-connector-java.jar
+PLIST_FILES=	%%JAVAJARDIR%%/jdbc2_0-stdext.jar \
+		%%JAVAJARDIR%%/jta-spec1_0_1.jar \
+		%%JAVAJARDIR%%/mysql-connector-java.jar
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -75,23 +76,23 @@ do-build:
 do-install: do-install-jar do-install-apidocs
 
 do-install-jar:
-	@${ECHO_CMD} -n ">> Installing .jar files..."
+	@${ECHO_MSG} -n ">> Installing .jar files..."
 	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
 	@for extrajar in ${EXTRAJARS} ; do                                 \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \
 	done
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${APIDOCSDIR}
 	@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}
 	@for extradoc in ${EXTRADOCS} ; do                    \
 	  ${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \
 	done
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 6b65938e27b2..e4282a149dc8 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-connector-java-3.1.6.tar.gz) = 0800a4fe488531346c368da93131eb31
-SIZE (mysql-connector-java-3.1.6.tar.gz) = 1601715
+MD5 (mysql-connector-java-3.1.7.tar.gz) = 3ce0ff78bc399e5e1d2686596e5ab4e1
+SIZE (mysql-connector-java-3.1.7.tar.gz) = 1651792
diff --git a/databases/mysql-connector-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml
index 1d4001d026f4..336e6a836c94 100644
--- a/databases/mysql-connector-java/files/patch-build.xml
+++ b/databases/mysql-connector-java/files/patch-build.xml
@@ -4,7 +4,7 @@
  			<include name="**/*.jar"/>
  		</fileset>
  
-+		<fileset dir="/usr/local/share/java/classes">
++		<fileset dir="${javajardir}">
 +			<include name="junit.jar"/>
 +			<include name="log4j.jar"/>
 +		</fileset>