[Midnightbsd-cvs] mports: mports/Mk: Attempt to fix index issue with java and magus.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Attempt to fix index issue with java and magus.  

We don't support the alpha, remove it from the ruby file.

Modified Files:
--------------
    mports/Mk:
        bsd.java.mk (r1.14 -> r1.15)
        bsd.ruby.mk (r1.4 -> r1.5)

-------------- next part --------------
Index: bsd.java.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.java.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -L Mk/bsd.java.mk -L Mk/bsd.java.mk -u -r1.14 -r1.15
--- Mk/bsd.java.mk
+++ Mk/bsd.java.mk
@@ -199,7 +199,7 @@
 
 # Enforce preferred Java ports according to OS
 .		if (${ARCH} == "amd64") || (${ARCH} == "i386")
-.			if defined(MAGUS) || defined{PACKAGE_BUILDING}
+.			if defined(MAGUS) || defined(PACKAGE_BUILDING) || defined(BATCH)
 _JAVA_PREFERRED_PORTS+= JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
 .			else
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
Index: bsd.ruby.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.ruby.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -L Mk/bsd.ruby.mk -L Mk/bsd.ruby.mk -u -r1.4 -r1.5
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -438,7 +438,7 @@
 .undef RUBY_NO_RD_HTML
 .endif
 
-.if (${ARCH} == alpha || ${ARCH} == sparc64) && ${RUBY_VER} <= 1.6
+.if (${ARCH} == sparc64) && ${RUBY_VER} <= 1.6
 RUBY_NO_RD_HTML=	yes
 .endif