git: 3f4897050843 - 2021Q4 - java/bouncycastle15: Pet portfmt and portclippy

The branch 2021Q4 has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f489705084337d8b770aafd4a9bd8dd6e37a203

commit 3f489705084337d8b770aafd4a9bd8dd6e37a203
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-11-24 17:37:04 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-11-25 14:47:12 +0000

    java/bouncycastle15: Pet portfmt and portclippy
    
    MFH:            2021Q4
    Sponsored by:   Modirum MDPay
    Sponsored by:   Klara, Inc.
    
    (cherry picked from commit 374e9ed352b30f0d298ab574bfa6fb32bcc49fb4)
---
 java/bouncycastle15/Makefile | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile
index 1cc29ba3602a..959de8427a0b 100644
--- a/java/bouncycastle15/Makefile
+++ b/java/bouncycastle15/Makefile
@@ -13,34 +13,40 @@ COMMENT=	Cleanroom build of Java Cryptography Extensions
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${JAVALIBDIR}/mail.jar:java/javamail \
-		${JAVALIBDIR}/junit.jar:java/junit
+BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit \
+		${JAVALIBDIR}/mail.jar:java/javamail
 RUN_DEPENDS=	${JAVALIBDIR}/mail.jar:java/javamail
 
-OPTIONS_DEFINE=	DOCS ZIPSRC
-OPTIONS_DEFAULT=	ZIPSRC
-OPTIONS_SUB=	yes
-ZIPSRC_DESC=	Install bundled ZIP source files
-CONFLICTS_INSTALL=	bouncycastle-1.4*
-DVERSION=	${PORTVERSION:S/.//}
-NO_ARCH=	yes
-CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
-CPE_VENDOR=	${PORTNAME}
-USE_JAVA=	yes
 USES=		cpe
-JDKMVERSION=	1.5
-JDKNVERSION=	15
+CPE_VENDOR=	${PORTNAME}
+CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 USE_ANT=	yes
+USE_JAVA=	yes
+
+MAKE_ARGS=	-f \
+		ant/jdk${JDKNVERSION}+.xml
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
-MAKE_ARGS=	-f ant/jdk${JDKNVERSION}+.xml
 ALL_TARGET=	build-provider build zip-src
 
+CONFLICTS_INSTALL=	bouncycastle-1.4*
+
+NO_ARCH=	yes
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS ZIPSRC
+OPTIONS_DEFAULT=	ZIPSRC
+OPTIONS_SUB=		yes
+
+ZIPSRC_DESC=	Install bundled ZIP source files
+
+DVERSION=	${PORTVERSION:S/.//}
+JDKMVERSION=	1.5
+JDKNVERSION=	15
 JARS_SRC=	bcmail bcpkix bcprov bcpg
 JARS_DOCS=	${JARS_SRC} bctest bctls
 JARS=		${JARS_DOCS} bcprov-ext
 
-PORTDOCS=	*
-
 .include <bsd.port.options.mk>
 
 # PR 220612: remove fork="true" in javac and fork="yes" in junit tasks