Date: Thu, 4 Oct 2007 11:12:46 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@freebsd.org Cc: openoffice@FreeBSD.org Subject: [PATCH] editors/openoffice.org: Properly set Java versions allowed Message-ID: <20071004151246.11D17C115@kirby.cyberbotx.com>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+
+USE_JAVA= yes
.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5
--- openoffice.org-2.3.0.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071004151246.11D17C115>