Move java.mk to java-vm.mk to avoid name conflict with devel/mk-files as

suggested by Simon J. Gerraty.

7 files changed, 14 insertions, 14 deletions

diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index aaad2800bb8..50db4c12f8e 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/23 16:33:03 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/26 20:52:12 jlam Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between jakarta-ant and crimson, each of which
@@ -28,5 +28,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/crimson
 	cd ${WRKSRC}/examples && ${PAX} -rwpp * ${PREFIX}/share/examples/java/crimson
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 7325d781812..9d0779701ac 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/18 21:31:56 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/26 20:52:12 jlam Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -37,5 +37,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/fop
 	cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/fop
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index f2c62e22fb1..65697a43823 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/18 21:33:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/26 20:52:12 jlam Exp $
 #
 
 DISTNAME=	saxon
@@ -28,5 +28,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/saxon
 	(cd ${WRKSRC} && ${PAX} -r -w -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java)
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index f753508a393..f1ce614f14c 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/18 21:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/12/26 20:52:12 jlam Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xalan-J,
 # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -31,5 +31,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
 	cd ${WRKSRC}/samples && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xalan
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 6c1b627bf72..c4ba79a4085 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/10/18 21:36:53 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/26 20:52:13 jlam Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xerces-J,
 # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -30,5 +30,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
 	cd ${WRKSRC}/data && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xerces
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 54f0cda12a1..3b090599153 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/18 21:41:36 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/26 20:52:13 jlam Exp $
 #
 
 DISTNAME=	xp
@@ -28,5 +28,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xp
 	cd ${WRKDIR}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/xp
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 9ad78c1028c..a1497a447c2 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/18 21:43:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/26 20:52:13 jlam Exp $
 #
 
 DISTNAME=	xt
@@ -33,5 +33,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xt
 	cd ${WRKDIR}/demo && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xt
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"