From 42a70aa12ba9c3d634f7807b618a14ebf85f22c5 Mon Sep 17 00:00:00 2001
From: stefan <stefan@FreeBSD.org>
Date: Thu, 8 Jun 2006 16:51:59 +0000
Subject: Update to 1.3.

PR:		97540
Submitted by:	Tian-Jian Jiang <tmjiang@iis.sinica.edu.tw>
Patch by:	stefan
Approved by:	maintainer timeout (18 days)
---
 java/jakarta-commons-pool/Makefile              | 16 ++++---------
 java/jakarta-commons-pool/distinfo              |  6 ++---
 java/jakarta-commons-pool/files/patch-build.xml | 32 -------------------------
 3 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 java/jakarta-commons-pool/files/patch-build.xml

(limited to 'java')

diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index d7c14c04b9d3..c70531f35f07 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	commons-pool
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
@@ -17,15 +16,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	toha@toha.org.ua
 COMMENT=	Jakarta Object-pooling API
 
-BUILD_DEPENDS=	${JAR_DEPENDS}
-RUN_DEPENDS=	${JAR_DEPENDS}
-
-JAR_DEPENDS=	${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
-
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+JAVA_VERSION=	1.3+
 
 USE_ANT=	yes
 MAKE_ENV+=	ANT_INCLUDE_SHARED_JARS=YES
@@ -35,10 +27,10 @@ ALL_TARGET=	build-jar
 ALL_TARGET=	build-jar javadoc
 PORTDOCS=	*
 .endif
-JARFILE=	${PORTNAME}.jar
+JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
diff --git a/java/jakarta-commons-pool/distinfo b/java/jakarta-commons-pool/distinfo
index b63193c01c49..f1a0d7d978a5 100644
--- a/java/jakarta-commons-pool/distinfo
+++ b/java/jakarta-commons-pool/distinfo
@@ -1,3 +1,3 @@
-MD5 (commons-pool-1.2-src.tar.gz) = e7dc9f479c6a4260f84f6751b434295a
-SHA256 (commons-pool-1.2-src.tar.gz) = 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e
-SIZE (commons-pool-1.2-src.tar.gz) = 269500
+MD5 (commons-pool-1.3-src.tar.gz) = a2dcdff75de2af76f5f2169494ed3499
+SHA256 (commons-pool-1.3-src.tar.gz) = 28c055168601cc57c8a4cff360b79b6409fabfd7275605031c43c7b06b978add
+SIZE (commons-pool-1.3-src.tar.gz) = 305175
diff --git a/java/jakarta-commons-pool/files/patch-build.xml b/java/jakarta-commons-pool/files/patch-build.xml
deleted file mode 100644
index b9537e85e19f..000000000000
--- a/java/jakarta-commons-pool/files/patch-build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
---- build.xml.orig	Tue May 16 16:41:33 2006
-+++ build.xml	Tue May 16 16:42:52 2006
-@@ -93,7 +93,8 @@
-                noindex="false"
-                nohelp="true"
-                nonavbar="false"
--               serialwarn="false">
-+	       serialwarn="false"
-+	       source="1.2">
-           <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-       </javadoc>
-    </target>
-@@ -107,7 +108,8 @@
-              classpath="${classpath}"
-              debug="${javac.debug}"
-              deprecation="${javac.deprecation}"
--             optimize="${javac.optimize}"/>
-+	     optimize="${javac.optimize}"
-+	     source="1.2"/>
-    </target>
-    
-    <target name="compile-test" depends="compile">
-@@ -116,7 +118,8 @@
-              srcdir="${src.test.dir}"
-              debug="${javac.debug}"
-              deprecation="${javac.deprecation}"
--             optimize="${javac.optimize}">
-+	     optimize="${javac.optimize}"
-+	     source="1.2">
-         <classpath>
-           <pathelement location="${build.classes.dir}" /> 
-           <pathelement location="${build.test-classes.dir}" /> 
-- 
cgit