From 53d88f1a3ca16ae5a741056d53c11ddc6f05e2f2 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Wed, 19 Jul 2006 06:45:20 +0000
Subject: [PATCH] Update to 1.33 release: - install only jars for the selected
 jdk to avoid class conflicts - drop support for obsolate jdks - take
 maintainership [1]

Approved by:	glewis [1]
---
 java/bouncycastle/Makefile  | 22 +++++++++++++---------
 java/bouncycastle/distinfo  |  6 +++---
 java/bouncycastle/pkg-descr |  3 +++
 java/bouncycastle/pkg-plist | 31 +++++--------------------------
 4 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index 8d1dd04aba86..4e566f5681c3 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	bouncycastle
-PORTVERSION=	1.30
+PORTVERSION=	1.33
 CATEGORIES=	java security
 MASTER_SITES=	http://www.bouncycastle.org/download/ \
 		http://polydistortion.net/bc/download/ \
 		http://bouncycastle.gva.es/download/
 DISTNAME=	crypto-${DISTVERSION}
 
-MAINTAINER=	glewis@FreeBSD.org
+MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Cleanroom build of Java Cryptography Extensions
 
-USE_JAVA=	yes
-JAVA_VERSION=	1.2+
 NO_BUILD=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+JDKMVERSION=	${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
 DISTVERSION=	${PORTVERSION:S/.//}
 
+JARS=		bcprov bcmail bctsp bcpg bctest
+
+PORTDOCS=	*
+
 do-install:
-	cd ${WRKSRC}/jars && \
-	  for jar in *.jar; do \
-	    ${INSTALL_DATA} $${jar} \
-	      ${JAVAJARDIR}/`echo $${jar} | sed -e "s/-${DISTVERSION}//"`; \
-	  done
+.for jar in ${JARS}
+	${INSTALL_DATA} ${WRKSRC}/jars/${jar}-jdk${JDKMVERSION}-${DISTVERSION}.jar \
+	      ${JAVAJARDIR}/${jar}.jar
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
diff --git a/java/bouncycastle/distinfo b/java/bouncycastle/distinfo
index 7a3add8c8bf0..93178a0b6ae2 100644
--- a/java/bouncycastle/distinfo
+++ b/java/bouncycastle/distinfo
@@ -1,3 +1,3 @@
-MD5 (crypto-130.tar.gz) = c627b186f6d2e2b973851d9f91847584
-SHA256 (crypto-130.tar.gz) = 50c7163eba47fd33013f449b3014f3799afecdab324d99024e11e24a7b8679e7
-SIZE (crypto-130.tar.gz) = 12844397
+MD5 (crypto-133.tar.gz) = f79b16b3e3d25c9447cb736bf9533023
+SHA256 (crypto-133.tar.gz) = 18493b5ef120f9ca236b49671d943f377cc2899d04bb57e8f7538b990bfe9bed
+SIZE (crypto-133.tar.gz) = 12879105
diff --git a/java/bouncycastle/pkg-descr b/java/bouncycastle/pkg-descr
index f8492eebcd66..ed7b9c3d7324 100644
--- a/java/bouncycastle/pkg-descr
+++ b/java/bouncycastle/pkg-descr
@@ -16,3 +16,6 @@ The Bouncy Castle Crypto APIs consist of the following:
 It's distributed under a modified X license.
 
 WWW: http://www.bouncycastle.org/
+
+- Alex Dupre
+ale@FreeBSD.org
diff --git a/java/bouncycastle/pkg-plist b/java/bouncycastle/pkg-plist
index 058f5e2d6332..4f2ad27cc67e 100644
--- a/java/bouncycastle/pkg-plist
+++ b/java/bouncycastle/pkg-plist
@@ -1,26 +1,5 @@
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS.html
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/releasenotes.html
-%%PORTDOCS%%%%DOCSDIR%%/specifications.html
-%%JAVAJARDIR%%/bcmail-jdk13.jar
-%%JAVAJARDIR%%/bcmail-jdk14.jar
-%%JAVAJARDIR%%/bcmail-jdk15.jar
-%%JAVAJARDIR%%/bcpg-jdk12.jar
-%%JAVAJARDIR%%/bcpg-jdk13.jar
-%%JAVAJARDIR%%/bcpg-jdk14.jar
-%%JAVAJARDIR%%/bcpg-jdk15.jar
-%%JAVAJARDIR%%/bcprov-jdk12.jar
-%%JAVAJARDIR%%/bcprov-jdk13.jar
-%%JAVAJARDIR%%/bcprov-jdk14.jar
-%%JAVAJARDIR%%/bcprov-jdk15.jar
-%%JAVAJARDIR%%/bctest-jdk12.jar
-%%JAVAJARDIR%%/bctest-jdk13.jar
-%%JAVAJARDIR%%/bctest-jdk14.jar
-%%JAVAJARDIR%%/bctest-jdk15.jar
-%%JAVAJARDIR%%/bctsp-jdk13.jar
-%%JAVAJARDIR%%/bctsp-jdk14.jar
-%%JAVAJARDIR%%/bctsp-jdk15.jar
-%%JAVAJARDIR%%/jce-jdk12.jar
-%%JAVAJARDIR%%/jce-jdk13.jar
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%JAVAJARDIR%%/bcmail.jar
+%%JAVAJARDIR%%/bcpg.jar
+%%JAVAJARDIR%%/bcprov.jar
+%%JAVAJARDIR%%/bctest.jar
+%%JAVAJARDIR%%/bctsp.jar