[pkgsrc/trunk]: pkgsrc/lang Skip the check for the right file -- the installe...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba0b2f7741f0
branches:  trunk
changeset: 531601:ba0b2f7741f0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 02 17:55:17 2007 +0000

description:
Skip the check for the right file -- the installed file is under
${EMUL_ARCH}, not ${MACHINE_ARCH}.

diffstat:

 lang/sun-jre15/Makefile |  4 ++--
 lang/sun-jre6/Makefile  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4e5e5b9cb6c9 -r ba0b2f7741f0 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Thu Aug 02 17:29:50 2007 +0000
+++ b/lang/sun-jre15/Makefile   Thu Aug 02 17:55:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2007/08/02 17:55:17 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -27,7 +27,7 @@
 CONF_FILES+=   ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
-CHECK_FILES_SKIP+=     ${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+CHECK_FILES_SKIP+=     ${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre15
 PKG_SUPPORTED_OPTIONS= sun-jre-jce
diff -r 4e5e5b9cb6c9 -r ba0b2f7741f0 lang/sun-jre6/Makefile
--- a/lang/sun-jre6/Makefile    Thu Aug 02 17:29:50 2007 +0000
+++ b/lang/sun-jre6/Makefile    Thu Aug 02 17:55:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/02 17:55:17 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -28,7 +28,7 @@
 CONF_FILES+=   ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
-CHECK_FILES_SKIP+=     ${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+CHECK_FILES_SKIP+=     ${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre6
 PKG_SUPPORTED_OPTIONS= sun-jre-jce