From dglo@hyde.ssec.wisc.edu  Mon May 20 10:12:25 2002
Return-Path: <dglo@hyde.ssec.wisc.edu>
Received: from hyde.ssec.wisc.edu (hyde.ssec.wisc.edu [128.104.109.251])
	by hub.freebsd.org (Postfix) with ESMTP id B93FF37B410
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 May 2002 10:11:52 -0700 (PDT)
Received: from hyde.ssec.wisc.edu (localhost [127.0.0.1])
	by hyde.ssec.wisc.edu (8.10.2+Sun/8.10.2) with ESMTP id g4KHBcV04768
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 May 2002 12:11:38 -0500 (CDT)
Message-Id: <200205201711.g4KHBcV04768@hyde.ssec.wisc.edu>
Date: Mon, 20 May 2002 12:11:38 -0500
From: Dave Glowacki <dglo@hyde.ssec.wisc.edu>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Maintainer update of java/jakarta-oro
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         38350
>Category:       ports
>Synopsis:       Maintainer update of java/jakarta-oro
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    znerd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 20 10:20:04 PDT 2002
>Closed-Date:    Wed May 22 11:22:29 PDT 2002
>Last-Modified:  Wed May 22 11:22:29 PDT 2002
>Originator:     Dave Glowacki
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD eusebius.glowacki.org 4.5-STABLE FreeBSD 4.5-STABLE #5: Wed Mar 27 17:11:17 CST 2002 @eusebius.glowacki.org:/usr/src/sys/compile/EUSEBIUS i386


	
>Description:
	Update jakarta-oro from 2.0.1 to 2.0.6
>How-To-Repeat:
>Fix:

diff -ru jakarta-oro.old/Makefile jakarta-oro/Makefile
--- jakarta-oro.old/Makefile	Tue Dec 25 12:31:21 2001
+++ jakarta-oro/Makefile	Mon May 20 10:56:30 2002
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	jakarta-oro
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.6
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-oro/release/v${PORTVERSION}/
 
 MAINTAINER=	dglo@ssec.wisc.edu
 
-BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
-RUN_DEPENDS=	${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk
+USE_JAVA=	1.2+
+NEED_JAVAC=	YES
 
-JAVA_HOME?=	${LOCALBASE}/jdk1.2.2
 PLIST=	${WRKDIR}/PLIST
 
 post-extract:
 	@${CP} ${.CURDIR}/pkg-plist ${WRKDIR}/PLIST
 
 do-build:
-	@cd ${WRKSRC}/build && ${SETENV} PATH=$$PATH:${JAVA_HOME}/bin \
-		JAVA_HOME=${JAVA_HOME} ${SH} build-oro.sh package
+	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant jar javadocs)
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/jakarta-oro-2.0.1.jar ${LOCALBASE}/share/java/classes/jakarta-oro.jar
+	@${INSTALL_DATA} ${WRKSRC}/jakarta-oro-${PORTVERSION}.jar ${LOCALBASE}/share/java/classes/jakarta-oro.jar
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/doc/api && ${TAR} -c -f - .) \
diff -ru jakarta-oro.old/distinfo jakarta-oro/distinfo
--- jakarta-oro.old/distinfo	Tue Dec 25 12:31:21 2001
+++ jakarta-oro/distinfo	Mon May 20 10:45:27 2002
@@ -1 +1 @@
-MD5 (jakarta-oro-2.0.1.tar.gz) = 8121de3b79acf5f8c8112d518dcf53f0
+MD5 (jakarta-oro-2.0.6.tar.gz) = a1698f1a325584a6fc32690cd58d9986
diff -ru jakarta-oro.old/files/patch-build::build-oro.sh jakarta-oro/files/patch-build::build-oro.sh
--- jakarta-oro.old/files/patch-build::build-oro.sh	Tue Dec 25 12:31:22 2001
+++ jakarta-oro/files/patch-build::build-oro.sh	Mon May 20 10:59:28 2002
@@ -1,13 +0,0 @@
-$FreeBSD: ports/java/jakarta-oro/files/patch-build::build-oro.sh,v 1.1 2001/12/25 18:31:22 petef Exp $
-
---- build/build-oro.sh.orig	Fri Dec  8 15:59:15 2000
-+++ build/build-oro.sh	Fri Dec  8 15:59:29 2000
-@@ -36,7 +36,7 @@
- 
- echo "Now building ${TARGET}..."
- 
--CP=${CLASSPATH}:ant.jar:xml.jar
-+CP=ant.jar:xml.jar:${CLASSPATH}
- 
- echo "Classpath: ${CP}"
- echo "JAVA_HOME: ${JAVA_HOME}"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->znerd 
Responsible-Changed-By: znerd 
Responsible-Changed-When: Wed May 22 11:17:14 PDT 2002 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38350 
State-Changed-From-To: open->closed 
State-Changed-By: znerd 
State-Changed-When: Wed May 22 11:22:16 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

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