ports/116906: [PATCH] editors/openoffice.org: Properly set Java versions allowed

[Naram Qashat]

>Number:         116906
>Category:       ports
>Synopsis:       [PATCH] editors/openoffice.org: Properly set Java versions allowed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 15:20:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
>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 at 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 ---

>Release-Note:
>Audit-Trail:
>Unformatted: