- Add JAVAC and JAR variables to the Makefile so they are easier to

  override.
- Also install the doc files in the post-install target.

PR:		20718
Submitted by:	maintainer

6 files changed, 66 insertions, 15 deletions

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index e66bb8cd3cb0..d7afa063d731 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -16,12 +16,19 @@ MAINTAINER=	dglo@SSEC.WISC.EDU
 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 --git a/databases/mysql-connector-java/files/patch-aa b/databases/mysql-connector-java/files/patch-aa
index d1439b25bff5..be2ac4adba7c 100644
--- a/databases/mysql-connector-java/files/patch-aa
+++ b/databases/mysql-connector-java/files/patch-aa
@@ -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 @@
++++ Makefile	Sun Aug 27 13:38:46 2000
+@@ -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/*~
diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile
index e66bb8cd3cb0..d7afa063d731 100644
--- a/databases/mysql-connector-java50/Makefile
+++ b/databases/mysql-connector-java50/Makefile
@@ -16,12 +16,19 @@ MAINTAINER=	dglo@SSEC.WISC.EDU
 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 --git a/databases/mysql-connector-java50/files/patch-aa b/databases/mysql-connector-java50/files/patch-aa
index d1439b25bff5..be2ac4adba7c 100644
--- a/databases/mysql-connector-java50/files/patch-aa
+++ b/databases/mysql-connector-java50/files/patch-aa
@@ -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 @@
++++ Makefile	Sun Aug 27 13:38:46 2000
+@@ -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/*~
diff --git a/databases/mysql-jdbc-mm/Makefile b/databases/mysql-jdbc-mm/Makefile
index e66bb8cd3cb0..d7afa063d731 100644
--- a/databases/mysql-jdbc-mm/Makefile
+++ b/databases/mysql-jdbc-mm/Makefile
@@ -16,12 +16,19 @@ MAINTAINER=	dglo@SSEC.WISC.EDU
 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 --git a/databases/mysql-jdbc-mm/files/patch-aa b/databases/mysql-jdbc-mm/files/patch-aa
index d1439b25bff5..be2ac4adba7c 100644
--- a/databases/mysql-jdbc-mm/files/patch-aa
+++ b/databases/mysql-jdbc-mm/files/patch-aa
@@ -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 @@
++++ Makefile	Sun Aug 27 13:38:46 2000
+@@ -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/*~