Date: Mon, 04 Mar 2002 12:57:18 -0600 From: Dave Glowacki <dglo@hyde.ssec.wisc.edu> To: petef@FreeBSD.org Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/34150: Maintainer update of databases/mysql-jdbc-mm Message-ID: <200203041857.g24IvIR25710@hyde.ssec.wisc.edu> In-Reply-To: Your message of "Tue, 19 Feb 2002 23:47:39 PST." <200202200747.g1K7ldx43428@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
petef@FreeBSD.org wrote: > Synopsis: Maintainer update of databases/mysql-jdbc-mm > > State-Changed-From-To: open->feedback > State-Changed-By: petef > State-Changed-When: Tue Feb 19 23:47:25 PST 2002 > State-Changed-Why: > Could you submit a diff to the current port in CVS instead of a new shar? Sorry for the delay in re-submitting this. After patching, you should remove files/patch-Makefile, which is no longer needed. diff -ru mysql-jdbc-mm.old/Makefile mysql-jdbc-mm/Makefile --- mysql-jdbc-mm.old/Makefile Fri Jun 1 06:49:08 2001 +++ mysql-jdbc-mm/Makefile Mon Feb 25 21:28:51 2002 @@ -5,29 +5,68 @@ # $FreeBSD: ports/databases/mysql-jdbc-mm/Makefile,v 1.7 2001/06/01 11:49:08 jeh Exp $ # +#BROKEN= Distribution contains bad JAR files. + PORTNAME= mysql-jdbc-mm -PORTVERSION= 1.2c +PORTVERSION= 2.0.11 CATEGORIES= databases java -MASTER_SITES= http://mmmysql.sourceforge.net/dist/ -DISTNAME= mm.mysql.jdbc-${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= mmmysql +DISTNAME= mm.mysql-${PORTVERSION} +EXTRACT_SUFX= -you-must-unjar-me.jar MAINTAINER= dglo@SSEC.WISC.EDU -BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk +BUILD_DEPENDS= ${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk13 \ + ant:${PORTSDIR}/devel/jakarta-ant +RUN_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk13 + +JAVA_HOME?= ${PREFIX}/jdk1.3.1 + +EXTRACT_CMD= ${JAVA_HOME}/bin/jar +EXTRACT_BEFORE_ARGS= -xf -ALL_TARGET= jar +post-patch: + @(cd ${WRKSRC}; ${MV} build.xml build.xml.patched; \ + ${SED} -e "s;%%WRKSRC%%;${WRKSRC};g" -e "s;%%PREFIX%%;${PREFIX};g" \ + < build.xml.patched > build.xml) + @(cd ${WRKSRC}; ${MV} j1c j1c.patched; \ + ${SED} "s;%%PREFIX%%;${PREFIX};g" < j1c.patched > j1c; \ + ${CHMOD} 555 j1c) + +do-build: + @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant clean dist) +.if !defined(NOPORTDOCS) + @(cd ${WRKSRC}; ${MKDIR} doc; \ + ${JAVA_HOME}/bin/javadoc -d doc -package \ + -classpath ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta- spec1_0_1.jar:${CLASSPATH} \ + org.gjt.mm.mysql org.gjt.mm.mysql.jdbc2) +.endif do-install: @${MKDIR} ${PREFIX}/share/java/classes - @${INSTALL_DATA} ${WRKSRC}/mysql_comp.jar ${LOCALBASE}/share/java/classes - -post-install: + @${INSTALL_DATA} ${WRKSRC}/build/mm.mysql-${PORTVERSION}/mm.mysql-${PORTVERSI ON}-bin.jar \ + ${PREFIX}/share/java/classes/mm.mysql-${PORTVERSION}.jar + @${INSTALL_DATA} ${WRKSRC}/lib/jdbc2_0-stdext.jar \ + ${PREFIX}/share/java/classes/ + @${INSTALL_DATA} ${WRKSRC}/lib/jta-spec1_0_1.jar \ + ${PREFIX}/share/java/classes/ .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/mysql-jdbc @(cd ${WRKSRC}/doc && ${TAR} -c -f - .) \ | (cd ${PREFIX}/share/doc/mysql-jdbc && ${TAR} --unlink -x -f -) +.endif + +post-install: + @${ECHO} share/java/classes/mm.mysql-${PORTVERSION}.jar >> ${TMPPLIST} + @${ECHO} share/java/classes/jdbc2_0-stdext.jar >> ${TMPPLIST} + @${ECHO} share/java/classes/jta-spec1_0_1.jar >> ${TMPPLIST} +.if !defined(NOPORTDOCS) @(cd ${PREFIX} \ && find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST}) + @${ECHO} "@dirrm share/doc/mysql-jdbc" >> ${TMPPLIST} .endif + @${ECHO} "@unexec ${RMDIR} %D/share/java/classes 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO} "@unexec ${RMDIR} %D/share/java 2>/dev/null || true" >> ${TMPPLIST} .include <bsd.port.mk> diff -ru mysql-jdbc-mm.old/distinfo mysql-jdbc-mm/distinfo --- mysql-jdbc-mm.old/distinfo Sat Apr 29 20:09:57 2000 +++ mysql-jdbc-mm/distinfo Mon Feb 25 21:31:39 2002 @@ -1 +1 @@ -MD5 (mm.mysql.jdbc-1.2c.tar.gz) = b04aa7f3048c2ebb169ee88ce19a6a4c +MD5 (mm.mysql-2.0.11-you-must-unjar-me.jar) = 7149d381387c10b57d288546e7a47e9e diff -ru mysql-jdbc-mm.old/files/patch-Makefile mysql-jdbc-mm/files/patch-Makef ile --- mysql-jdbc-mm.old/files/patch-Makefile Fri Jun 1 06:49:08 2001 +++ mysql-jdbc-mm/files/patch-Makefile Tue Feb 26 07:50:42 2002 @@ -1,21 +0,0 @@ ---- Makefile.orig Sun May 27 12:10:22 2001 -+++ Makefile Sun May 27 12:16:18 2001 -@@ -3,14 +3,16 @@ - # $Id: Makefile,v 1.2 1998/08/25 04:02:25 mmatthew Exp $ - # - --JAVAC = /usr/local/jdk118/bin/javac -+JAVA_HOME = /usr/local/jdk1.1.8 -+JAVAC = JAVA_HOME=$(JAVA_HOME) CLASSPATH= $(JAVA_HOME)/bin/javac -+JAR = JAVA_HOME=$(JAVA_HOME) CLASSPATH= $(JAVA_HOME)/bin/jar - JAVAC_FLAGS =-O -g - - all: - $(JAVAC) $(JAVAC_FLAGS) org/gjt/mm/mysql/*.java - - jar: all -- jar -cv0f mysql_uncomp.jar org/gjt/mm/mysql/*.class; jar -cvf mysql_comp.jar org/gjt/mm/mysql/*.class -+ $(JAR) -cv0f mysql_uncomp.jar org/gjt/mm/mysql/*.class; $(JAR) -cvf mysql_comp.jar org/gjt/mm/mysql/*.class - - clean: - rm -f org/gjt/mm/mysql/*.class org/gjt/mm/mysql/*~ diff -ru mysql-jdbc-mm.old/files/patch-build.xml mysql-jdbc-mm/files/patch-buil d.xml --- mysql-jdbc-mm.old/files/patch-build.xml Thu Nov 29 18:00:12 2001 +++ mysql-jdbc-mm/files/patch-build.xml Mon Feb 25 21:32:05 2002 @@ -1,25 +1,16 @@ ---- build.xml.orig Thu Nov 29 16:34:30 2001 -+++ build.xml Thu Nov 29 16:36:25 2001 +--- build.xml.orig Mon Jan 21 20:14:41 2002 ++++ build.xml Mon Jan 21 20:24:25 2002 @@ -1,7 +1,7 @@ <project name="MM.MySQL" default="dist" basedir="."> - <property name="version" value="2.0.8"/> + <property name="version" value="2.0.11"/> - <property name="java1.1.home" value="d:/jdk1.1.8"/> - <property name="javac.1.1" value="${java1.1.home}/bin/javac"/> + <property name="java1.1.home" value="%%PREFIX%%/jdk1.1.8"/> + <property name="javac.1.1" value="%%WRKSRC%%/j1c"/> + <!-- enable the following property to build under Eclipse... --> + <!--<property name="build.compiler" value="org.eclipse.pde.internal.core.JDT CompilerAdapter"/>--> - - -@@ -43,7 +43,7 @@ - <target name="compile-core" depends="init"> - <javac srcdir="./build/mm.mysql-${version}" - excludes="testsuite/**, org/gjt/mm/mysql/jdbc1/**, org/gjt/mm/mysql/jdbc2/**" -- classpath="./build/mm.mysql-${version};lib/jdbc2_0-stdext.jar;lib/jta-spec 1_0_1.jar" -+ classpath="./build/mm.mysql-${version}:lib/jdbc2_0-stdext.jar:lib/jta-spec 1_0_1.jar" - debug="on" - /> - -@@ -51,7 +51,7 @@ +@@ -67,7 +67,7 @@ <target name="compile-jdbc1" depends="init, compile-core"> <exec dir="./build/mm.mysql-${version}/org/gjt/mm/mysql/jdbc1" executable="${javac.1.1}"> diff -ru mysql-jdbc-mm.old/pkg-plist mysql-jdbc-mm/pkg-plist --- mysql-jdbc-mm.old/pkg-plist Sat Jan 29 16:23:06 2000 +++ mysql-jdbc-mm/pkg-plist Tue Feb 26 07:52:49 2002 @@ -1 +0,0 @@ -share/java/classes/mysql_comp.jar To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203041857.g24IvIR25710>