From 27f7a391638bd6379237661c6e9aa913b3ba1ab1 Mon Sep 17 00:00:00 2001
From: Ernst de Haan <znerd@FreeBSD.org>
Date: Wed, 22 May 2002 18:22:13 +0000
Subject: Upgrade from 2.0.1 to 2.0.6.

Submitted by:	maintainer
PR:		38350
---
 java/jakarta-oro/Makefile                        | 12 +++++-------
 java/jakarta-oro/distinfo                        |  2 +-
 java/jakarta-oro/files/patch-build::build-oro.sh | 13 -------------
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 java/jakarta-oro/files/patch-build::build-oro.sh

(limited to 'java/jakarta-oro')

diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index c032c23c5904..0d56694bdb94 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -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 --git a/java/jakarta-oro/distinfo b/java/jakarta-oro/distinfo
index 6d984583803f..3f5ecb07b4ea 100644
--- a/java/jakarta-oro/distinfo
+++ b/java/jakarta-oro/distinfo
@@ -1 +1 @@
-MD5 (jakarta-oro-2.0.1.tar.gz) = 8121de3b79acf5f8c8112d518dcf53f0
+MD5 (jakarta-oro-2.0.6.tar.gz) = a1698f1a325584a6fc32690cd58d9986
diff --git a/java/jakarta-oro/files/patch-build::build-oro.sh b/java/jakarta-oro/files/patch-build::build-oro.sh
deleted file mode 100644
index 347bcb4c95d6..000000000000
--- a/java/jakarta-oro/files/patch-build::build-oro.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- 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}"
-- 
cgit v1.2.3