From 28579f758e8bb0b124c21db7004e08ce26d2c4bf Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Mon, 26 Jul 2004 05:37:19 +0000
Subject: [PATCH] . Update to 1.2 [1] . Don't define local copies of
 JAVASHAREDIR and JAVAJARDIR. . Use %%JAVAJARDIR%% in the packing list now
 that bsd.java.mk supports it.

PR:		69525 [1]
Submitted by:	Anton Yudin <toha@toha.org.ua> (maintainer) [1]
---
 java/jakarta-commons-pool/Makefile  | 8 +++-----
 java/jakarta-commons-pool/distinfo  | 4 ++--
 java/jakarta-commons-pool/pkg-plist | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index 2d0955b9c35d..dde542aee426 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	commons-pool
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/pool/source/
 PKGNAMEPREFIX=	jakarta-
@@ -30,8 +30,6 @@ ANT_TARGET=	build-jar
 ANT_TARGET=	build-jar javadoc
 PORTDOCS=	*
 .endif
-JAVASHAREDIR=	${PREFIX}/share/java
-JARDIR=		${JAVASHAREDIR}/classes
 JARFILE=	${PORTNAME}.jar
 DESTJARFILE=	${PORTNAME}.jar
 
@@ -40,8 +38,8 @@ do-build:
 		${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/${DESTJARFILE}
+	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	@${CP} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
diff --git a/java/jakarta-commons-pool/distinfo b/java/jakarta-commons-pool/distinfo
index 357c0ac7f43e..a98ecd8219bb 100644
--- a/java/jakarta-commons-pool/distinfo
+++ b/java/jakarta-commons-pool/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta/commons-pool-1.1-src.tar.gz) = 344b568101f56cf5bc73d43e6fbe5892
-SIZE (jakarta/commons-pool-1.1-src.tar.gz) = 46476
+MD5 (jakarta/commons-pool-1.2-src.tar.gz) = e7dc9f479c6a4260f84f6751b434295a
+SIZE (jakarta/commons-pool-1.2-src.tar.gz) = 269500
diff --git a/java/jakarta-commons-pool/pkg-plist b/java/jakarta-commons-pool/pkg-plist
index 1bc54f875151..a0ad44396c9f 100644
--- a/java/jakarta-commons-pool/pkg-plist
+++ b/java/jakarta-commons-pool/pkg-plist
@@ -1 +1 @@
-share/java/classes/commons-pool.jar
+%%JAVAJARDIR%%/commons-pool.jar