[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Reset JAVA_HOME and CLASSPATH that defin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55155686b8cd
branches:  trunk
changeset: 603331:55155686b8cd
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri May 04 11:00:43 2012 +0000

description:
Reset JAVA_HOME and CLASSPATH that defined by user.
Fix build when JAVA_HOME and/or CLASSPATH are defined by user.

diffstat:

 lang/openjdk7/Makefile |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r fad2a4976c3f -r 55155686b8cd lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Fri May 04 10:33:44 2012 +0000
+++ b/lang/openjdk7/Makefile    Fri May 04 11:00:43 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/02/16 22:14:12 hans Exp $
+# $NetBSD: Makefile,v 1.30 2012/05/04 11:00:43 ryoon Exp $
 
 DISTNAME=      openjdk-7-fcs-src-b147-27_jun_2011
 PKGNAME=       openjdk7-1.7.0.147.20110811
@@ -65,6 +65,10 @@
 MAKE_ENV+=     SKIP_FASTDEBUG_BUILD=yes
 MAKE_ENV+=     SKIP_DEBUG_BUILD=yes
 
+# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
+MAKE_ENV+=     JAVA_HOME=
+MAKE_ENV+=     CLASSPATH=
+
 MAKE_ENV+=     EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
 
 BUILDDIR=      ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}