From nobody Tue Jan 04 15:44:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 481B5193C908; Tue, 4 Jan 2022 15:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSxkr6pt9z3vGK; Tue, 4 Jan 2022 15:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB4A51B73F; Tue, 4 Jan 2022 15:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 204Fiqrm037378; Tue, 4 Jan 2022 15:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204Fiqsn037377; Tue, 4 Jan 2022 15:44:52 GMT (envelope-from git) Date: Tue, 4 Jan 2022 15:44:52 GMT Message-Id: <202201041544.204Fiqsn037377@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 5511c16caba4 - main - print/pdftk: Use bouncycastle dependency from ports tree List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5511c16caba4bba47d1d8f197b95144b29014d6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641311093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3CMcWqKBqSkiOHz8FSf8YDPI5GHZAJ4Yza/n2hOv0DQ=; b=MBFh3RpygX/gyZZV2KlF6jMeDakdG6+LD9Wk/JzqqPXDAbaqbtmX4yaaJiRtnHSjt9ETAC MJF2vQN8wUPu/H8um6QDb3Z4AogRRK3BkOOUgJIVM/WwrW+pjPZih1yDw/mt5KrJ/WigMS dZ509zydYJuS9t78D2IPCcsFEf4bEpawZa1U5waRg0tAIy2EBSxpnpRZBg0KfQlt+TzLZf DZzxJDWrSbDp6mXcBIqaowZRKhqVAPbNGi6B90K0ixedqWcrjVE0bvEKvq9dasRQmeuxXu AXFpylE2IrqLcC9clo/NbQAPt32od9vbrBkaS1ZLuzGn6NZhub1Py+BNj3xz3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641311093; a=rsa-sha256; cv=none; b=RkWleD+CeWX+zSSys2SdlkoDcWlw0N3u+xYeE1twBuCY0vUOvdMHhVOdFgPGpJakNG+Q6F dj3CMlz0YzYS6Tp/KqMwnLRVPzWk6GlIxEwsEimjGLZFEv0gyzn7FjjzBxGtRHT93ArQ7n 5mwF+LdhpGBey52PrlvWmM6OkXHzdvC8PLp4zqi3w1jK5p6ZFTM4aLFv60hHS18reP1/DP 4iO9JhVNlxEODYz7Ukmugru3dMxDNURHbPM7ty3EEoRJrhtleCogV5aIYj+raYToAibFYP mwyOy4SE+ovExplLZGHnTZbPQ8SCwbvdd3/34AYHlJyXPGZOyEf9qjHxYOLNsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=5511c16caba4bba47d1d8f197b95144b29014d6f commit 5511c16caba4bba47d1d8f197b95144b29014d6f Author: Andreas Bilke AuthorDate: 2022-01-04 12:05:28 +0000 Commit: Fernando Apesteguía 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