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

suggested by Simon J. Gerraty.

20 files changed, 44 insertions, 45 deletions

diff --git a/chat/pircbot/Makefile b/chat/pircbot/Makefile
index d73e75b9d3b..562e2fc8f4d 100644
--- a/chat/pircbot/Makefile
+++ b/chat/pircbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/12/25 23:03:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/26 20:52:09 jlam Exp $
 #
 
 DISTNAME=	pircbot-0.9.11
@@ -27,5 +27,5 @@ do-install:
 	cd ${WRKSRC}/javadocs && \
 	    ${PAX} -rwpppm . ${PREFIX}/share/doc/java/pircbot
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index c621eed5db6..dddfce17bcc 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/13 09:32:49 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/26 20:52:10 jlam Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	java-db3-3.11.2
@@ -42,5 +42,5 @@ INSTALL_TARGET=		install_java
 WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 
 .include "../../databases/db3/buildlink2.mk"
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index c22fc36cb31..ddf537ea547 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/18 21:05:28 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/26 20:52:10 jlam Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -42,7 +42,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
 CLASSPATH:=	${CLASSPATH}:${LOCALBASE}/lib/java/crimson.jar
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile
index b05987d5a32..00783900883 100644
--- a/devel/javadeps/Makefile
+++ b/devel/javadeps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/18 21:10:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/26 20:52:10 jlam Exp $
 #
 
 DISTNAME=	javadeps-1.1
@@ -31,5 +31,5 @@ do-install:
 	cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/jdeps
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/jdeps ${PREFIX}/share/doc/jdeps
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index 7b7cf1d821a..e87af036020 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/18 21:12:11 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:10 jlam Exp $
 #
 
 DISTNAME=	jasmin-1.06
@@ -28,5 +28,5 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/jasmin
 	${LN} -s ${PREFIX}/jasmin/bin/jasmin ${PREFIX}/bin/jasmin
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jini/Makefile b/lang/jini/Makefile
index bf7ecf77326..3922e28c6bb 100644
--- a/lang/jini/Makefile
+++ b/lang/jini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/15 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:11 jlam Exp $
 #
 
 DISTNAME=		jini-${SUN_VERSION}-src
@@ -58,5 +58,5 @@ do-install:
 cleandir: clean
 	${RM} -fr ${JINI_HOME}
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index f9763c89004..be3b648f973 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/15 02:22:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/26 20:52:11 jlam Exp $
 #
 
 DISTNAME=	joos-0.2
@@ -17,5 +17,5 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${PREFIX}/joos
 	cd ${PREFIX}/joos/Bin && ${LN} -s joos.a- joos
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 11e76900999..a066e6e6ccb 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/14 22:38:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/26 20:52:11 jlam Exp $
 
 DISTNAME=		nhc98src-1.14a
 PKGNAME=		nhc98-1.14a
@@ -35,6 +35,5 @@ post-extract:
 	@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
 
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index ae9d40d7eb1..cd0d705c3fa 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/12/24 20:19:21 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2002/12/26 20:52:11 jlam Exp $
 
 DISTNAME=		openoffice-0.0.0.641
 PKGREVISION=		1
@@ -109,5 +109,5 @@ do-install:
 
 .include "../../devel/pth/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9d7478b9e54..6ad176ca964 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1115 2002/12/25 12:32:32 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1116 2002/12/26 20:52:13 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -55,7 +55,7 @@ _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 
 INTERACTIVE_STAGE?=	none
 
-.if !defined(JAVA_MK)
+.if !defined(JAVA_VM_MK)
 .if defined(USE_JAVA)
 BUILD_DEFS+=		PKG_JVM
 .  if !defined(PKG_JVM)
@@ -136,7 +136,7 @@ SCRIPTS_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 
 PATH:=			${PKG_JAVA_HOME}/bin:${PATH}
 .endif
-.endif	! JAVA_MK
+.endif	! JAVA_VM_MK
 
 # Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR,  BUILDLINK_X11_DIR so
 # that if no buildlink2.mk files are included, then they still point to
diff --git a/mk/java.mk b/mk/java-vm.mk
index 203ff37b950..f9ee33e9064 100644
--- a/mk/java.mk
+++ b/mk/java-vm.mk
@@ -1,8 +1,8 @@
-# $NetBSD: java.mk,v 1.8 2002/12/25 04:48:20 jlam Exp $
+# $NetBSD: java-vm.mk,v 1.1 2002/12/26 20:52:14 jlam Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
-# build-time or at run-time.  java.mk will:
+# build-time or at run-time.  java-vm.mk will:
 #
 #	* set PKG_JVM and PKG_JAVA_HOME to the name of the JVM used and
 #	  to the directory in which the JVM is installed, respectively;
@@ -20,8 +20,8 @@
 # PKG_JVMS_ACCEPTED is a package-settable list of JVMs that may be used as
 #	possible dependencies for the package.
 
-.if !defined(JAVA_MK)
-JAVA_MK=	# defined
+.if !defined(JAVA_VM_MK)
+JAVA_VM_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -254,4 +254,4 @@ MAKE_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 CONFIGURE_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 SCRIPTS_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 
-.endif	# JAVA_MK
+.endif	# JAVA_VM_MK
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile
index d3977128faf..3be404702f6 100644
--- a/net/airportbasestationconfig/Makefile
+++ b/net/airportbasestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/12/18 22:14:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2002/12/26 20:52:11 jlam Exp $
 
 DISTNAME=	configurator_152-128
 PKGNAME=	${BINNAME}-1.5.2
@@ -48,5 +48,5 @@ do-install:
 	${INSTALL_DATA} ReadMe.txt ${DOCDIR}/README && \
 	${INSTALL_DATA} mainscreen.jpg manual.html ${DOCDIR}
 
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index cd08edc261d..2400fdb87aa 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/18 21:54:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/26 20:52:13 jlam Exp $
 
 DISTNAME=	jakarta-tomcat-3.2.4-src
 PKGNAME=	ap-jk-3.2.4
@@ -25,5 +25,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mod_jk.so ${PREFIX}/lib/httpd
 
 .include "../../www/apache/buildlink2.mk"
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"