From owner-svn-ports-all@FreeBSD.ORG  Mon Aug 27 17:43:39 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C0BA106566B;
	Mon, 27 Aug 2012 17:43:39 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 837698FC0A;
	Mon, 27 Aug 2012 17:43:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7RHhdBV032870;
	Mon, 27 Aug 2012 17:43:39 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7RHhdUs032867;
	Mon, 27 Aug 2012 17:43:39 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201208271743.q7RHhdUs032867@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 27 Aug 2012 17:43:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303237 - head/java/icedtea-web
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2012 17:43:39 -0000

Author: jkim
Date: Mon Aug 27 17:43:38 2012
New Revision: 303237
URL: http://svn.freebsd.org/changeset/ports/303237

Log:
  Allow java/openjdk7 to build and execute Java plugin.  A necessary patch for
  OpenJDK7 was committed as r303173.

Modified:
  head/java/icedtea-web/Makefile

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Mon Aug 27 17:39:52 2012	(r303236)
+++ head/java/icedtea-web/Makefile	Mon Aug 27 17:43:38 2012	(r303237)
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_JAVA=	yes
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6
+JAVA_VERSION=	1.6+
 USE_XORG=	x11
 
 OPTIONS_DEFINE=	PLUGIN RHINO TEST
@@ -90,12 +90,14 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    ${WRKSRC}/launcher/javaws.in
 
+.if ${JAVA_PORT_VERSION} == "1.6.0"
 pre-extract:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"
-	@${ECHO_MSG} "for java/openjdk6 (default).  Otherwise, it will neither build nor work."
+	@${ECHO_MSG} "for ${JAVA_PORT} (default).  Otherwise, it will neither build nor work."
 	@${ECHO_MSG}
 	@sleep 10
+.endif
 
 .if ${PORT_OPTIONS:MTEST}
 post-build: