From owner-freebsd-openoffice@FreeBSD.ORG Thu Oct 4 15:25:56 2007 Return-Path: Delivered-To: openoffice@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5AAF16A418 for ; Thu, 4 Oct 2007 15:25:56 +0000 (UTC) (envelope-from cyberbotx@cyberbotx.com) Received: from sccrmhc12.comcast.net (sccrmhc12.comcast.net [204.127.200.82]) by mx1.freebsd.org (Postfix) with ESMTP id 8C4AF13C469 for ; Thu, 4 Oct 2007 15:25:56 +0000 (UTC) (envelope-from cyberbotx@cyberbotx.com) Received: from samus.cyberbotx.com ([68.62.97.217]) by comcast.net (sccrmhc12) with ESMTP id <2007100415130401200g7trhe>; Thu, 4 Oct 2007 15:13:04 +0000 Received: from localhost (localhost.cyberbotx.com [127.0.0.1]) by samus.cyberbotx.com (Postfix) with ESMTP id 4E2101739E; Thu, 4 Oct 2007 11:13:03 -0400 (EDT) X-Virus-Scanned: amavisd-new at cyberbotx.com Received: from samus.cyberbotx.com ([127.0.0.1]) by localhost (samus.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HWT1CwyAKZT7; Thu, 4 Oct 2007 11:12:46 -0400 (EDT) Received: from kirby.cyberbotx.com (unknown [192.168.2.2]) by samus.cyberbotx.com (Postfix) with ESMTP id 6B1B3172F1; Thu, 4 Oct 2007 11:12:46 -0400 (EDT) Received: by kirby.cyberbotx.com (Postfix, from userid 1001) id 11D17C115; Thu, 4 Oct 2007 11:12:46 -0400 (EDT) To: FreeBSD-gnats-submit@freebsd.org From: Naram Qashat X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20071004151246.11D17C115@kirby.cyberbotx.com> Date: Thu, 4 Oct 2007 11:12:46 -0400 (EDT) Cc: openoffice@FreeBSD.org Subject: [PATCH] editors/openoffice.org: Properly set Java versions allowed X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2007 15:25:56 -0000 >Submitter-Id: current-users >Originator: Naram Qashat >Organization: >Confidential: no >Synopsis: [PATCH] editors/openoffice.org: Properly set Java versions allowed >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 6.2-RELEASE-p7 i386 >Environment: System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #11: Fri Sep 14 21:50:03 EDT 2007 >Description: This patch moves the USE_JAVA line to after bsd.port.pre.mk so that _JAVA_VERSION will be set to "1.4 1.5" instead of "1.1 1.2 1.3 1.4 1.5 1.6" because of bsd.java.mk being included too early the way it was before. Port maintainer (openoffice@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- openoffice.org-2.3.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/editors/openoffice.org/Makefile /kirby/shared/ports/openoffice.org-2/Makefile --- /usr/ports/editors/openoffice.org/Makefile Thu Oct 4 11:09:40 2007 +++ /kirby/shared/ports/openoffice.org-2/Makefile Thu Oct 4 11:07:37 2007 @@ -50,11 +50,12 @@ USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true -USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= freebsd bsdjava .include + +USE_JAVA= yes .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 --- openoffice.org-2.3.0.patch ends here ---