mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

- Update to 3.1.10 [1]

Browse Source 
- Don't try to mkdir ${JAVAJARDIR} as it has been part of mtree for more than 3
  years now

PR:		83059 [1]
Submitted by:	maintainer [1]
This commit is contained in:
Herve Quiroz 2005-07-06 16:10:23 +00:00
parent 7a3f855baa
commit 2f524a5c53
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=138602
6 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
databases/mysql-connector-java/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= mysql-connector-java
PORTVERSION= 3.1.8
PORTVERSION= 3.1.10
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Connector-J
@ -24,9 +24,9 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
USE_JAVA= yes
USE_ANT= yes
JAVA_VERSION= 1.4+
ALL_TARGET= clean compile-driver
ALL_TARGET= clean dist
MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}
BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
.else
@ -37,14 +37,16 @@ BUILDDIR= ${WRKDIR}/${DISTNAME}
.endif
APIDOCSDIR= ${DOCSDIR}/javadoc
SRCDIR= ${WRKDIR}/${DISTNAME}/src
JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
DESTJARFILE= ${PORTNAME}.jar
EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar
EXTRADOCS= README CHANGES
EXTRADOCS= README CHANGES docs/index.html docs/connector-j-en.pdf
JARFILE= ${DISTNAME}-bin.jar
JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
JDCLASSPATH= ${SRCDIR}:${SRCDIR}/lib/jdbc2_0-stdext.jar:${SRCDIR}/lib/jta-spec1_0_1.jar:${CLASSPATH}
PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \
%%JAVAJARDIR%%/jta-spec1_0_1.jar \
%%JAVAJARDIR%%/jta-spec1_0_1.jar \
%%JAVAJARDIR%%/mysql-connector-java.jar
.if !defined(NOPORTDOCS)
@ -67,9 +69,9 @@ post-build:
do-build:
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \
${JAVADOC} -d ${BUILDDIR}/doc -package \
-classpath ${JDCLASSPATH} \
@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
${JAVADOC} -d ${JAVADOCDIR} -package \
-classpath ${JDCLASSPATH} \
com.mysql.jdbc org.gjt.mm.mysql)
.endif
@ -77,10 +79,9 @@ do-install: do-install-jar do-install-apidocs
do-install-jar:
@${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} ; \
@for extrajar in ${EXTRAJARS} ; do \
${INSTALL_DATA} ${INSTALL_WRKSRC}/src/lib/$$extrajar ${JAVAJARDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
@ -88,9 +89,9 @@ do-install-apidocs:
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${APIDOCSDIR}
@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}
@for extradoc in ${EXTRADOCS} ; do \
${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \
@${CP} -r ${JAVADOCDIR}/* ${APIDOCSDIR}
@for extradoc in ${EXTRADOCS} ; do \
${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${DOCSDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
.endif

4
databases/mysql-connector-java/distinfo
View File

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

30
databases/mysql-connector-java/files/patch-build.xml
View File

@ -1,14 +1,30 @@
--- build.xml~ Thu Dec 23 19:37:39 2004
+++ build.xml Wed Jan 12 12:59:16 2005
@@ -60,6 +60,11 @@
$FreeBSD$
--- build.xml.orig Thu Jun 23 00:29:13 2005
+++ build.xml Tue Jul 5 23:08:11 2005
@@ -57,12 +57,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}" />
</path>
</fileset>
<pathelement location="${buildDir}/${fullProdName}" />
@@ -253,7 +254,7 @@
includes="**/*.class,**/*.properties*,COPYING,README"
excludes="testsuite/**"
index="true"
- manifest="${buildDir}/MANIFEST.MF"/>
+ manifest="${buildDir}/META-INF/MANIFEST.MF"/>
</target>
<target name="dist-trace" depends="init, compile-driver-trace">

31
databases/mysql-connector-java50/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= mysql-connector-java
PORTVERSION= 3.1.8
PORTVERSION= 3.1.10
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Connector-J
@ -24,9 +24,9 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
USE_JAVA= yes
USE_ANT= yes
JAVA_VERSION= 1.4+
ALL_TARGET= clean compile-driver
ALL_TARGET= clean dist
MAKE_ARGS= -Djavalibdir=${JAVALIBDIR}
BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME}
BUILDDIR= ${WRKDIR}/${DISTNAME}/build/${DISTNAME}
.else
@ -37,14 +37,16 @@ BUILDDIR= ${WRKDIR}/${DISTNAME}
.endif
APIDOCSDIR= ${DOCSDIR}/javadoc
SRCDIR= ${WRKDIR}/${DISTNAME}/src
JAVADOCDIR= ${WRKDIR}/${DISTNAME}/javadoc
DESTJARFILE= ${PORTNAME}.jar
EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar
EXTRADOCS= README CHANGES
EXTRADOCS= README CHANGES docs/index.html docs/connector-j-en.pdf
JARFILE= ${DISTNAME}-bin.jar
JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
JDCLASSPATH= ${SRCDIR}:${SRCDIR}/lib/jdbc2_0-stdext.jar:${SRCDIR}/lib/jta-spec1_0_1.jar:${CLASSPATH}
PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \
%%JAVAJARDIR%%/jta-spec1_0_1.jar \
%%JAVAJARDIR%%/jta-spec1_0_1.jar \
%%JAVAJARDIR%%/mysql-connector-java.jar
.if !defined(NOPORTDOCS)
@ -67,9 +69,9 @@ post-build:
do-build:
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \
${JAVADOC} -d ${BUILDDIR}/doc -package \
-classpath ${JDCLASSPATH} \
@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR}; \
${JAVADOC} -d ${JAVADOCDIR} -package \
-classpath ${JDCLASSPATH} \
com.mysql.jdbc org.gjt.mm.mysql)
.endif
@ -77,10 +79,9 @@ do-install: do-install-jar do-install-apidocs
do-install-jar:
@${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} ; \
@for extrajar in ${EXTRAJARS} ; do \
${INSTALL_DATA} ${INSTALL_WRKSRC}/src/lib/$$extrajar ${JAVAJARDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
@ -88,9 +89,9 @@ do-install-apidocs:
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${APIDOCSDIR}
@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}
@for extradoc in ${EXTRADOCS} ; do \
${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \
@${CP} -r ${JAVADOCDIR}/* ${APIDOCSDIR}
@for extradoc in ${EXTRADOCS} ; do \
${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${DOCSDIR} ; \
done
@${ECHO_MSG} " [ DONE ]"
.endif

4
databases/mysql-connector-java50/distinfo
View File

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

30
databases/mysql-connector-java50/files/patch-build.xml
View File

@ -1,14 +1,30 @@
--- build.xml~ Thu Dec 23 19:37:39 2004
+++ build.xml Wed Jan 12 12:59:16 2005
@@ -60,6 +60,11 @@
$FreeBSD$
--- build.xml.orig Thu Jun 23 00:29:13 2005
+++ build.xml Tue Jul 5 23:08:11 2005
@@ -57,12 +57,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}" />
</path>
</fileset>
<pathelement location="${buildDir}/${fullProdName}" />
@@ -253,7 +254,7 @@
includes="**/*.class,**/*.properties*,COPYING,README"
excludes="testsuite/**"
index="true"
- manifest="${buildDir}/MANIFEST.MF"/>
+ manifest="${buildDir}/META-INF/MANIFEST.MF"/>
</target>
<target name="dist-trace" depends="init, compile-driver-trace">