sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.1.7 [1]

Browse source 
- 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
This commit is contained in:
Herve Quiroz 2005-02-22 21:17:44 +00:00
parent eff3ff96af
commit f5b4176d87
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=129572
6 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
databases/mysql-connector-java/Makefile
View file

@ -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>

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

@ -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

2
databases/mysql-connector-java/files/patch-build.xml
View file

@ -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>

23
databases/mysql-connector-java50/Makefile
View file

@ -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>

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

@ -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

2
databases/mysql-connector-java50/files/patch-build.xml
View file

@ -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>