From rv@arabica.esil.univ-mrs.fr  Tue Sep  7 08:31:20 2004
Return-Path: <rv@arabica.esil.univ-mrs.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C11AE16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  7 Sep 2004 08:31:20 +0000 (GMT)
Received: from arabica.esil.univ-mrs.fr (arabica.esil.univ-mrs.fr [139.124.41.108])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 11B7043D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  7 Sep 2004 08:31:20 +0000 (GMT)
	(envelope-from rv@arabica.esil.univ-mrs.fr)
Received: from arabica.esil.univ-mrs.fr (localhost.esil.univ-mrs.fr [127.0.0.1])
	by arabica.esil.univ-mrs.fr (8.12.10/8.12.10) with ESMTP id i878VIoT047562
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 7 Sep 2004 10:31:19 +0200 (CEST)
	(envelope-from rv@arabica.esil.univ-mrs.fr)
Received: (from rv@localhost)
	by arabica.esil.univ-mrs.fr (8.12.10/8.12.10/Submit) id i878VIdw047561;
	Tue, 7 Sep 2004 10:31:18 +0200 (CEST)
	(envelope-from rv)
Message-Id: <200409070831.i878VIdw047561@arabica.esil.univ-mrs.fr>
Date: Tue, 7 Sep 2004 10:31:18 +0200 (CEST)
From: Herve Quiroz <hq@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] editors/openoffice: Use bsd.java.mk 2.0 features
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71451
>Category:       ports
>Synopsis:       [PATCH] editors/openoffice: Use bsd.java.mk 2.0 features
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 07 08:40:29 GMT 2004
>Closed-Date:    Tue Nov 30 02:27:04 GMT 2004
>Last-Modified:  Tue Nov 30 02:27:04 GMT 2004
>Originator:     Herve Quiroz
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #5: Mon Aug  2 19:39:13 CEST
>Description:

This patch should (not tested -- just here as a reminder) upgrade the port so
it is bsd.java.mk 2.0 compliant.

Here are a couple of statements from my original message just in case you're
missing something:

- If USE_ANT is defined then ${ANT} is set to the location of the ant
  executable and devel/apache-ant is added to BUILD_DEPENDS.
- Enforcing either JAVA_BUILD or JAVA_RUN supercedes the NO_{RUN|BUILD}_DEPENDS
  from bsd.java.mk 1.0.

More info in the Porter's Handbook, Java section or in [1]. Feel free to ask me
for further information on the subject.

When this is commited, please notify me so I can remove the port from my TODO
list [1], or just edit ports/72219 yourself and remove the corresponding entry
if you wish.

[1] ports/72219: Updating Java ports to bsd.java.mk 2.0

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- openoffice-1.1.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/editors/openoffice-1.1/Makefile,v
retrieving revision 1.164
diff -u -u -r1.164 Makefile
--- Makefile	31 Aug 2004 12:09:57 -0000	1.164
+++ Makefile	7 Sep 2004 08:21:54 -0000
@@ -38,8 +38,10 @@
 USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_JAVA)
-USE_JAVA=	1.4+
-NO_RUN_DEPENDS_JAVA=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+JAVA_BUILD=	jdk
+USE_ANT=	yes
 .endif
 
 .include <bsd.port.pre.mk>
@@ -102,14 +104,11 @@
 		freetype.9:${PORTSDIR}/print/freetype2
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	259
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-ANT?=		${LOCALBASE}/bin/ant
 TCSH?=		/bin/tcsh
 ZIP?=		${PREFIX}/bin/zip
 UNZIP?=		${PREFIX}/bin/unzip
--- openoffice-1.1.2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->maho 
Responsible-Changed-By: hq 
Responsible-Changed-When: Tue Sep 7 08:40:56 GMT 2004 
Responsible-Changed-Why:  
Here is the PR you asked for. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71451 
State-Changed-From-To: open->suspended 
State-Changed-By: maho 
State-Changed-When: Sun Oct 24 03:55:34 GMT 2004 
State-Changed-Why:  
suspended and re-assign to hq by his request 


Responsible-Changed-From-To: maho->hq 
Responsible-Changed-By: maho 
Responsible-Changed-When: Sun Oct 24 03:55:34 GMT 2004 
Responsible-Changed-Why:  
suspended and re-assign to hq by his request 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71451 
State-Changed-From-To: suspended->closed 
State-Changed-By: hq 
State-Changed-When: Tue Nov 30 02:26:16 GMT 2004 
State-Changed-Why:  
Ant suport in bsd.java.mk will be left as-is for the moment. 
This port should then remain as it is for now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71451 
>Unformatted:
