Attachment #81907 for bug #117219

View | Details | Raw Unified | Return to bug 117219
Collapse All | Expand All




# Date created:		8 October 2003
# Whom:			Matthew Seaman <m.seaman@infracaninophile.co.uk>
#
# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.45 2007/10/02 21:17:32 hq Exp $
#

PORTNAME=	mysql-connector-java
PORTVERSION=	5.1.5
CATEGORIES=	databases java
MASTER_SITES=	${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR=	Connector-J


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


pre-fetch:
	@${ECHO_MSG} ""
	@${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} "    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} ""

.if !defined(WITHOUT_COMPILE)
post-build:
.else
do-build:
.endif
.if !defined(NOPORTDOCS)
	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
	    ${JAVADOC} -quiet -breakiterator      \

Lines 1-3 Link Here

(-)mysql-connector-java/distinfo (-3 / +3 lines)
1	MD5 (mysql-connector-java-5.0.8.tar.gz) = 7a3caaa764fd6266bc312d8930972e8f	1	MD5 (mysql-connector-java-5.1.5.tar.gz) = 85289f74093a2b165d42f5ac38850d18
2	SHA256 (mysql-connector-java-5.0.8.tar.gz) = 660a0e2a2c88a5fe65f1c5baadb20535095d367bc3688e7248a622f4e71ad68d	2	SHA256 (mysql-connector-java-5.1.5.tar.gz) = 032be11733bf627467ac69e94ea94bdd472f1cf1fcf74e7c835235b3b2c35ba3
3	SIZE (mysql-connector-java-5.0.8.tar.gz) = 8652406	3	SIZE (mysql-connector-java-5.1.5.tar.gz) = 8168212




--- 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}" />

Return to bug 117219

Lines 2-12 Link Here

(-)mysql-connector-java/Makefile (-30 / +5 lines)
2	# Date created: 8 October 2003	2	# Date created: 8 October 2003
3	# Whom: Matthew Seaman <m.seaman@infracaninophile.co.uk>	3	# Whom: Matthew Seaman <m.seaman@infracaninophile.co.uk>
4	#	4	#
5	# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.46 2007/10/12 23:49:21 miwi Exp $	5	# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.45 2007/10/02 21:17:32 hq Exp $
6	#	6	#
7		7
8	PORTNAME= mysql-connector-java	8	PORTNAME= mysql-connector-java
9	PORTVERSION= 5.0.8	9	PORTVERSION= 5.1.5
10	CATEGORIES= databases java	10	CATEGORIES= databases java
11	MASTER_SITES= ${MASTER_SITE_MYSQL}	11	MASTER_SITES= ${MASTER_SITE_MYSQL}
12	MASTER_SITE_SUBDIR= Connector-J	12	MASTER_SITE_SUBDIR= Connector-J
Lines 16-41 Link Here
16		16
17	RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j	17	RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
18		18
19	.if !defined(WITHOUT_COMPILE)
20
21	BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
22	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
23
24	USE_JAVA= yes
25	USE_ANT= yes
26	JAVA_VERSION= 1.4+
27	ALL_TARGET= clean dist
28	MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
29	BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
30
31	.else
32
33	USE_JAVA= yes	19	USE_JAVA= yes
34	JAVA_VERSION= 1.3+	20	JAVA_VERSION= 1.3+
35	BUILDDIR= ${WRKDIR}/${DISTNAME}	21	BUILDDIR= ${WRKDIR}/${DISTNAME}
36
37	.endif
38
39	APIDOCSDIR= ${DOCSDIR}/javadoc	22	APIDOCSDIR= ${DOCSDIR}/javadoc
40	SRCDIR= ${WRKDIR}/${DISTNAME}/src	23	SRCDIR= ${WRKDIR}/${DISTNAME}/src
41	JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc	24	JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
Lines 55-74 Link Here
55		38
56	pre-fetch:	39	pre-fetch:
57	@${ECHO_MSG} ""	40	@${ECHO_MSG} ""
58	@${ECHO_MSG} "You may use the following build options to override the"	41	@${ECHO_MSG} "Note: this port now installs the pre-compiled driver without"
59	@${ECHO_MSG} "default behaviour:"	42	@${ECHO_MSG} "the option of compiling from source, because compilation requires"
60	@${ECHO_MSG} ""	43	@${ECHO_MSG} "a mix of Java-5 and Java-6 that is not supported by bsd.java.mk"
61	@${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file"
62	@${ECHO_MSG} ""
63	@${ECHO_MSG} "This port requires JDK 1.4.x or better to compile, but the"
64	@${ECHO_MSG} "JDBC driver can be made to operate with JVM 1.2.x or better"
65	@${ECHO_MSG} ""	44	@${ECHO_MSG} ""
66		45
67	.if !defined(WITHOUT_COMPILE)
68	post-build:
69	.else
70	do-build:	46	do-build:
71	.endif
72	.if !defined(NOPORTDOCS)	47	.if !defined(NOPORTDOCS)
73	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \	48	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
74	${JAVADOC} -quiet -breakiterator \	49	${JAVADOC} -quiet -breakiterator \

Lines 1-19 Link Here

(-)mysql-connector-java/files/patch-build.xml (-19 lines)
1	--- build.xml.orig Mon Oct 10 15:59:00 2005
2	+++ build.xml Tue Oct 18 09:45:11 2005
3	@@ -60,12 +60,13 @@
4	</path>
5
6	<path id="project.build.classpath">
7	- <fileset dir="${buildDir}/${fullProdName}/lib-nodist">
8	+ <fileset dir="${buildDir}/${fullProdName}/lib">
9	<include name="*/.jar"/>
10	</fileset>
11
12	- <fileset dir="${buildDir}/${fullProdName}/lib">
13	- <include name="*/.jar"/>
14	+ <fileset dir="${javalibdir}">
15	+ <include name="junit.jar"/>
16	+ <include name="log4j.jar"/>
17	</fileset>
18
19	<pathelement location="${buildDir}/${fullProdName}" />