git: 5511c16caba4 - main - print/pdftk: Use bouncycastle dependency from ports tree

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Tue, 04 Jan 2022 15:44:52 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5511c16caba4bba47d1d8f197b95144b29014d6f

commit 5511c16caba4bba47d1d8f197b95144b29014d6f
Author:     Andreas Bilke <andreas@bilke.org>
AuthorDate: 2022-01-04 12:05:28 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-01-04 15:42:59 +0000

    print/pdftk: Use bouncycastle dependency from ports tree
    
    pdftk fetched the bouncycastle depenency directly from some maven site and
    packaged it with pdftk. Use the ports version instead.
    
    PR:     260883
    Reported by:    andreas@bilke.org
---
 print/pdftk/Makefile | 19 +++++++++----------
 print/pdftk/distinfo |  4 +---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile
index ed76bf301f24..d5f47253442f 100644
--- a/print/pdftk/Makefile
+++ b/print/pdftk/Makefile
@@ -3,9 +3,8 @@
 PORTNAME=	pdftk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	print java
-MASTER_SITES=	https://repo.maven.apache.org/maven2/:bcprov
-DISTFILES=	${_BCPROV_JAR}:bcprov
 
 MAINTAINER=	andreas@bilke.org
 COMMENT=	Simple tool for doing everyday things with PDF documents
@@ -13,8 +12,10 @@ COMMENT=	Simple tool for doing everyday things with PDF documents
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3
-RUN_DEPENDS=	${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
+	${JAVALIBDIR}/bcprov.jar:java/bouncycastle15
+RUN_DEPENDS=	${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
+	${JAVALIBDIR}/bcprov.jar:java/bouncycastle15
 
 USE_ANT=	yes
 USE_GITLAB=	yes
@@ -26,25 +27,23 @@ NO_ARCH=	yes
 SUB_FILES=	pdftk
 SUB_LIST=	CLASSPATH="${_CLASSPATH:ts:}" \
 		JAVA="${JAVA}"
-PLIST_FILES=	${JAVAJARDIR}/${_BCPROV_JAR:T} \
-		${JAVAJARDIR}/pdftk.jar \
+PLIST_FILES=	${JAVAJARDIR}/pdftk.jar \
 		bin/pdftk \
 		share/man/man1/pdftk.1.gz
 
-_BCPROV_JAR=	org/bouncycastle/bcprov-jdk15on/1.69/bcprov-jdk15on-1.69.jar
-_CLASSPATH=	${JAVAJARDIR}/${_BCPROV_JAR:T} ${JAVAJARDIR}/commons-lang3.jar \
+_CLASSPATH=	${JAVAJARDIR}/commons-lang3.jar \
+		${JAVAJARDIR}/bcprov.jar \
 		${JAVAJARDIR}/pdftk.jar
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/lib
 	@${LN} -sf ${JAVAJARDIR}/commons-lang3.jar ${WRKSRC}/lib
-	@${LN} -sf ${DISTDIR}/${_BCPROV_JAR} ${WRKSRC}/lib
+	@${LN} -sf ${JAVAJARDIR}/bcprov.jar ${WRKSRC}/lib
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pdftk \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/jar/pdftk.jar \
-		${DISTDIR}/${_BCPROV_JAR} \
 		${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_MAN} ${WRKSRC}/pdftk.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
diff --git a/print/pdftk/distinfo b/print/pdftk/distinfo
index ab814831386b..96ba6dee27cc 100644
--- a/print/pdftk/distinfo
+++ b/print/pdftk/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1640464457
-SHA256 (org/bouncycastle/bcprov-jdk15on/1.69/bcprov-jdk15on-1.69.jar) = e469bd39f936999f256002631003ff022a22951da9d5bd9789c7abfa9763a292
-SIZE (org/bouncycastle/bcprov-jdk15on/1.69/bcprov-jdk15on-1.69.jar) = 5743920
+TIMESTAMP = 1641139556
 SHA256 (pdftk-java-pdftk-7d2ac3c1fa858f2c247c809fc6ef43f71f241098_GL0.tar.gz) = bc28b2f86817e4b459f63c127ee7c4dd5479fb747e6d897a44bbbafb829692c2
 SIZE (pdftk-java-pdftk-7d2ac3c1fa858f2c247c809fc6ef43f71f241098_GL0.tar.gz) = 2344308