Attachment #54914 for bug #83059

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

Lines 6-12 Link Here

(-)mysql-connector-java/Makefile (-14 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= mysql-connector-java	8	PORTNAME= mysql-connector-java
9	PORTVERSION= 3.1.8	9	PORTVERSION= 3.1.10
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 24-32 Link Here
24	USE_JAVA= yes	24	USE_JAVA= yes
25	USE_ANT= yes	25	USE_ANT= yes
26	JAVA_VERSION= 1.4+	26	JAVA_VERSION= 1.4+
27	ALL_TARGET= clean compile-driver	27	ALL_TARGET= clean dist
28	MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}	28	MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
29	BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}	29	BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
30		30
31	.else	31	.else
32		32
Lines 37-50 Link Here
37	.endif	37	.endif
38		38
39	APIDOCSDIR= ${DOCSDIR}/javadoc	39	APIDOCSDIR= ${DOCSDIR}/javadoc
		40	SRCDIR= ${WRKDIR}/${DISTNAME}/src
		41	JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
40	DESTJARFILE= ${PORTNAME}.jar	42	DESTJARFILE= ${PORTNAME}.jar
41	EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar	43	EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar
42	EXTRADOCS= README CHANGES	44	EXTRADOCS= README CHANGES docs/index.html docs/connector-j-en.pdf
43	JARFILE= ${DISTNAME}-bin.jar	45	JARFILE= ${DISTNAME}-bin.jar
44	JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}	46	JDCLASSPATH= ${SRCDIR}:${SRCDIR}/lib/jdbc2_0-stdext.jar:${SRCDIR}/lib/jta-spec1_0_1.jar:${CLASSPATH}
45		47
46	PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \	48	PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \
47	%%JAVAJARDIR%%/jta-spec1_0_1.jar \	49	%%JAVAJARDIR%%/jta-spec1_0_1.jar \
48	%%JAVAJARDIR%%/mysql-connector-java.jar	50	%%JAVAJARDIR%%/mysql-connector-java.jar
49		51
50	.if !defined(NOPORTDOCS)	52	.if !defined(NOPORTDOCS)
Lines 67-75 Link Here
67	do-build:	69	do-build:
68	.endif	70	.endif
69	.if !defined(NOPORTDOCS)	71	.if !defined(NOPORTDOCS)
70	@${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \	72	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
71	${JAVADOC} -d ${BUILDDIR}/doc -package \	73	${JAVADOC} -d ${JAVADOCDIR} -package \
72	-classpath ${JDCLASSPATH} \	74	-classpath ${JDCLASSPATH} \
73	com.mysql.jdbc org.gjt.mm.mysql)	75	com.mysql.jdbc org.gjt.mm.mysql)
74	.endif	76	.endif
75		77
Lines 79-86 Link Here
79	@${ECHO_MSG} -n ">> Installing .jar files..."	81	@${ECHO_MSG} -n ">> Installing .jar files..."
80	@${MKDIR} ${JAVAJARDIR}	82	@${MKDIR} ${JAVAJARDIR}
81	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}	83	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
82	@for extrajar in ${EXTRAJARS} ; do \	84	@for extrajar in ${EXTRAJARS} ; do \
83	${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \	85	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/lib/$$extrajar ${JAVAJARDIR} ; \
84	done	86	done
85	@${ECHO_MSG} " [ DONE ]"	87	@${ECHO_MSG} " [ DONE ]"
86		88
Lines 88-96 Link Here
88	.if !defined(NOPORTDOCS)	90	.if !defined(NOPORTDOCS)
89	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."	91	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
90	@${MKDIR} ${APIDOCSDIR}	92	@${MKDIR} ${APIDOCSDIR}
91	@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}	93	@${CP} -r ${JAVADOCDIR}/* ${APIDOCSDIR}
92	@for extradoc in ${EXTRADOCS} ; do \	94	@for extradoc in ${EXTRADOCS} ; do \
93	${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \	95	${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${DOCSDIR} ; \
94	done	96	done
95	@${ECHO_MSG} " [ DONE ]"	97	@${ECHO_MSG} " [ DONE ]"
96	.endif	98	.endif

Lines 1-2 Link Here

(-)mysql-connector-java/distinfo (-2 / +2 lines)
1	MD5 (mysql-connector-java-3.1.8.tar.gz) = d1c2b08184290e34c2c9a82945e257b2	1	MD5 (mysql-connector-java-3.1.10.tar.gz) = 337f7f31e726fb615d3f4f062030d1b5
2	SIZE (mysql-connector-java-3.1.8.tar.gz) = 7490467	2	SIZE (mysql-connector-java-3.1.10.tar.gz) = 6892037

Lines 1-14 Link Here

(-)mysql-connector-java/files/patch-build.xml (-6 / +20 lines)
1	--- build.xml~ Thu Dec 23 19:37:39 2004	1	--- build.xml.orig Thu Jun 23 00:29:13 2005
2	+++ build.xml Wed Jan 12 12:59:16 2005	2	+++ build.xml Tue Jul 5 23:08:11 2005
3	@@ -60,6 +60,11 @@	3	@@ -57,12 +57,13 @@
		4	</path>
		5
		6	<path id="project.build.classpath">
		7	- <fileset dir="${buildDir}/${fullProdName}/lib-nodist">
		8	+ <fileset dir="${buildDir}/${fullProdName}/lib">
4	<include name="*/.jar"/>	9	<include name="*/.jar"/>
5	</fileset>	10	</fileset>
6		11
		12	- <fileset dir="${buildDir}/${fullProdName}/lib">
		13	- <include name="*/.jar"/>
7	+ <fileset dir="${javalibdir}">	14	+ <fileset dir="${javalibdir}">
8	+ <include name="junit.jar"/>	15	+ <include name="junit.jar"/>
9	+ <include name="log4j.jar"/>	16	+ <include name="log4j.jar"/>
10	+ </fileset>	17	</fileset>
11	+	18
12	<pathelement location="${buildDir}/${fullProdName}" />	19	<pathelement location="${buildDir}/${fullProdName}" />
13	</path>	20	@@ -253,7 +254,7 @@
		21	includes="*/.class,*/.properties*,COPYING,README"
		22	excludes="testsuite/**"
		23	index="true"
		24	- manifest="${buildDir}/MANIFEST.MF"/>
		25	+ manifest="${buildDir}/META-INF/MANIFEST.MF"/>
		26	</target>
14		27
		28	<target name="dist-trace" depends="init, compile-driver-trace">

Return to bug 83059