Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 19 Aug 2000 13:04:21 -0500
From:      Dave Glowacki <dglo@ssec.wisc.edu>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/20718: Fixes for mysql-jdbc-mm package
Message-ID:  <200008191804.NAA22333@hyde.ssec.wisc.edu>
next in thread | raw e-mail | index | archive | help 

>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 <dutchman@tccn.cs.kun.nl> 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 <bsd.port.mk>
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200008191804.NAA22333>