Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Dec 26 20:52:14 UTC 2002

Modified Files:
	pkgsrc/chat/pircbot: Makefile
	pkgsrc/databases/java-db3: Makefile
	pkgsrc/devel/jakarta-ant: Makefile
	pkgsrc/devel/javadeps: Makefile
	pkgsrc/lang/jasmin: Makefile
	pkgsrc/lang/jini: Makefile
	pkgsrc/lang/joos: Makefile
	pkgsrc/lang/nhc98: Makefile
	pkgsrc/misc/openoffice: Makefile
	pkgsrc/mk: bsd.pkg.mk
	pkgsrc/net/airportbasestationconfig: Makefile
	pkgsrc/textproc/crimson: Makefile
	pkgsrc/textproc/fop: Makefile
	pkgsrc/textproc/saxon: Makefile
	pkgsrc/textproc/xalan-j: Makefile
	pkgsrc/textproc/xerces-j: Makefile
	pkgsrc/textproc/xp: Makefile
	pkgsrc/textproc/xt: Makefile
	pkgsrc/www/ap-jk: Makefile
Added Files:
	pkgsrc/mk: java-vm.mk
Removed Files:
	pkgsrc/mk: java.mk

Log Message:
Move java.mk to java-vm.mk to avoid name conflict with devel/mk-files as
suggested by Simon J. Gerraty.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/chat/pircbot/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/java-db3/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/devel/jakarta-ant/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/devel/javadeps/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/lang/jasmin/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/lang/jini/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/lang/joos/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/lang/nhc98/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/misc/openoffice/Makefile
cvs rdiff -r1.1115 -r1.1116 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/java-vm.mk
cvs rdiff -r1.8 -r0 pkgsrc/mk/java.mk
cvs rdiff -r1.19 -r1.20 pkgsrc/net/airportbasestationconfig/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/textproc/crimson/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/textproc/fop/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/textproc/saxon/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/textproc/xalan-j/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/textproc/xerces-j/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/textproc/xp/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/textproc/xt/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/www/ap-jk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.