From owner-freebsd-ports Sat Aug 19 11:10: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 050EC37B43E for ; Sat, 19 Aug 2000 11:10:04 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA24028; Sat, 19 Aug 2000 11:10:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from hyde.ssec.wisc.edu (hyde.ssec.wisc.edu [144.92.108.217]) by hub.freebsd.org (Postfix) with ESMTP id 2B9E337B422 for ; Sat, 19 Aug 2000 11:04:47 -0700 (PDT) Received: from hyde.ssec.wisc.edu (dglo@localhost [127.0.0.1]) by hyde.ssec.wisc.edu (8.9.3/8.9.3) with ESMTP id NAA22333 for ; Sat, 19 Aug 2000 13:04:21 -0500 (CDT) Message-Id: <200008191804.NAA22333@hyde.ssec.wisc.edu> Date: Sat, 19 Aug 2000 13:04:21 -0500 From: Dave Glowacki To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/20718: Fixes for mysql-jdbc-mm package Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20718 >Category: ports >Synopsis: Tweak build and install docs for mysql-jdbc-mm >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 19 11:10:03 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Dave Glowacki >Release: FreeBSD 4.1-RC i386 >Organization: >Environment: >Description: Kees Jan Koster sent me a patch to make the driver build with the alpha java 1.2.2 compiler, as well as requesting that I install the distributed javadoc files. I hacked up his patches, so any mistakes are likely my fault... Fix: diff -ru mysql-jdbc-mm-old/Makefile mysql-jdbc-mm/Makefile --- mysql-jdbc-mm-old/Makefile Mon May 29 22:10:58 2000 +++ mysql-jdbc-mm/Makefile Sat Aug 12 22:32:16 2000 @@ -16,12 +16,19 @@ BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk -MAKE_ENV+= JAVAC=${LOCALBASE}/jdk1.1.8/bin/javac - ALL_TARGET= jar do-install: @${MKDIR} ${PREFIX}/share/java/classes @${INSTALL_DATA} ${WRKSRC}/mysql_comp.jar ${LOCALBASE}/share/java/classes + +post-install: +.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 -) + @(cd ${PREFIX} \ + && find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST}) +.endif .include diff -ru mysql-jdbc-mm-old/patches/patch-aa mysql-jdbc-mm/patches/patch-aa --- mysql-jdbc-mm-old/patches/patch-aa Tue Apr 25 08:59:18 2000 +++ mysql-jdbc-mm/patches/patch-aa Sat Aug 12 22:35:15 2000 @@ -1,11 +1,21 @@ --- Makefile.orig Mon Feb 21 23:43:51 2000 +++ Makefile Sat Mar 4 09:34:31 2000 -@@ -3,7 +3,7 @@ +@@ -3,14 +3,16 @@ # $Id: Makefile,v 1.2 1998/08/25 04:02:25 mmatthew Exp $ # -JAVAC = /usr/local/jdk118/bin/javac -+JAVAC = javac ++JAVA_HOME=/usr/local/jdk1.1.8 ++JAVAC = $(JAVA_HOME)/bin/javac ++JAR = $(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/*~ >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message