From nobody Thu Jun 15 09:50:03 2023 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 4QhcwC65hqz4dFrH; Thu, 15 Jun 2023 09:50:03 +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 4QhcwC5Cb7z3nsM; Thu, 15 Jun 2023 09:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686822603; 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=9ZqGNtkIVEd13Mq1L+oJSnBy/XEIYkx8TuCSvS73jbg=; b=jUKHWqiFhDN1AHWR7znRZV52paBIU3HxeozjOuMWhiJA/cQdGW1jo/S/7K8i79bbBKN/Eo ppqrtZkAtgIIF0YWk/w06XmFCC8m/jDxWGiNczayQYCvNQ+gq3Er5paXjnW68aKov1F+w2 6Dl/0jbWja+9RGmU3TM46Iy+3x3fiA/R3c9tCoI8LB0FWx/lQeZN+klzmSunQQjenjAomd Jpkw+GSXkAt2/ck1udpJSs9+cJhNoKJ83vez9cydpWujy3l3f41LUN4HlM+7KVJ0nJjtou 1lruRx3WmGAibehyeUDO3BC/ob2G6rLIELyn2evT+gMJv1SFTfAVB3GpcRHPDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686822603; 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=9ZqGNtkIVEd13Mq1L+oJSnBy/XEIYkx8TuCSvS73jbg=; b=l/ztSwqcF1wpax4Yj7eiJqKituOooWnGUeOC3lHTv0MJSzDMy/MXuLYlLbbo3PzRwGo1Mz Wo/6cIW92QOdorI87oUPs9lXKoJgtlsQide3Ycbwar5zXe/ct0b4B/xOHFKaDzibXKLiIp qlC9hiqFnLHIzqdqPBgon4ry/iKu54+8661uBOHlKAnZ0zLBdH0UDhHsJifwkKQcUH03gr bcNL7sPtuMS5XkRj4Az1fPp1oKCGjYeI3QsVohrm+fTVwkVqjuIIHvHKCUqmBJMO43KH0f EYMC8kLmtRe9IkOjEUyrbzcKtjFffTbGlweBuK68DPE2zTJeH9AoQHoj0OAuCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686822603; a=rsa-sha256; cv=none; b=Cd5LcJ5PztHuDSKdBNW1JMvtarbvhTyFE6YyoLgnZ81eWbiVKcGingYvkbGEwJVNo7IRId yCKJMRp6kozOLwlBb+Dj7zs3hG+X2udAaXwDfZFc3Pv4UyWTvYJIvd391GYx3adMCmkdS9 f5C6Pi7EWDYXsgd89qWEnpzu8w9smoLPA5AKawey73vZlG/xX6ettTyftoTQRucwKmt0Cp Wjd1exe5wquwJDcOQRDLVFwwxEhNo4XYJwA5SqgRj7Jqavu3l5zfsdYnVyeSzhLnxnW79b XHopaL8syK4Qygo3lSMK4guvj4ilE/bQV5mKpEWtxijsyS8iuf/j5ivcOjcjog== 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 4QhcwC4GspzhSk; Thu, 15 Jun 2023 09:50:03 +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 35F9o3pF012038; Thu, 15 Jun 2023 09:50:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35F9o3I4012035; Thu, 15 Jun 2023 09:50:03 GMT (envelope-from git) Date: Thu, 15 Jun 2023 09:50:03 GMT Message-Id: <202306150950.35F9o3I4012035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: ca99a869ae69 - main - devel/apache-ant: Update to 1.10.13 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca99a869ae696c823bc116ba1c421b50df9f996b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca99a869ae696c823bc116ba1c421b50df9f996b commit ca99a869ae696c823bc116ba1c421b50df9f996b Author: Li-Wen Hsu AuthorDate: 2023-06-15 09:47:39 +0000 Commit: Li-Wen Hsu CommitDate: 2023-06-15 09:47:39 +0000 devel/apache-ant: Update to 1.10.13 - Directly use manual pages from Debian pacakge - Pet portclippy(1) PR: 268843 Sponsored by: The FreeBSD Foundation --- devel/apache-ant/Makefile | 41 +++++++++++++++++++---------------------- devel/apache-ant/distinfo | 14 +++++++------- devel/apache-ant/pkg-plist | 2 ++ 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 0ea977f2b2c4..a41d3b27ec9a 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -1,8 +1,8 @@ PORTNAME= apache-ant -DISTVERSION= 1.10.8 +DISTVERSION= 1.10.13 CATEGORIES= devel java -MASTER_SITES= https://archive.apache.org/dist/ant/binaries/:bin \ - LOCAL/hq:man +MASTER_SITES= APACHE/ant/binaries:bin \ + https://deb.debian.org/debian/pool/main/a/ant/:man DISTFILES= ${ANT_DISTFILE}:bin \ ${MANPAGE_DISTFILE}:man EXTRACT_ONLY= ${ANT_DISTFILE} @@ -18,61 +18,58 @@ CPE_VENDOR= apache CPE_PRODUCT= ant USE_JAVA= yes -OPTIONS_DEFINE= DOCS - ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-bin.tar.bz2 -MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz -MANPAGE_VERSION= 20030908 +MANPAGE_DISTFILE= ant_${DISTVERSION}-${MANPAGE_VERSION}.debian.tar.xz +MANPAGE_VERSION= 1 +DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_ARCH= yes NO_BUILD= yes -DATADIR= ${JAVASHAREDIR}/${PORTNAME} READMES= LICENSE README WHATSNEW +OPTIONS_DEFINE= DOCS + .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc -MASTER_SITES+= https://archive.apache.org/dist/ant/manual/:doc +MASTER_SITES+= APACHE/ant/manual:doc PORTDOCS= * .endif -MANPAGE_SUBDIR= apache-ant-manpage -MANPAGE_WRKSRC= ${WRKSRC}/${MANPAGE_SUBDIR} - SUB_FILES= ant.sh post-extract: - @${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${MANPAGE_DISTFILE} + @${TAR} -C ${WRKSRC} -xJf ${DISTDIR}/${MANPAGE_DISTFILE} debian/ant.1 debian/build.xml.5 do-install: @${ECHO_MSG} -n ">> Installing scripts..." - @${MKDIR} ${STAGEDIR}${DATADIR}/bin - @${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant - @${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/ + ${MKDIR} ${STAGEDIR}${DATADIR}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant + ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/ @${ECHO_MSG} " [ DONE ]" .for d in etc lib @${ECHO_MSG} -n ">> Installing data directory '${d}'..." - @cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ @${ECHO_MSG} " [ DONE ]" .endfor @${ECHO_MSG} -n ">> Installing manpages..." - @${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1 - @${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/debian/ant.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/debian/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5 @${ECHO_MSG} " [ DONE ]" .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} -n ">> Installing readme files..." - @${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing documentation files..." - @cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} " [ DONE ]" .endif diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo index a9d20bdb2136..7b287530534a 100644 --- a/devel/apache-ant/distinfo +++ b/devel/apache-ant/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1595160316 -SHA256 (apache-ant-1.10.8-bin.tar.bz2) = 45c1e9992b3ddcaa2f472b5be7ea804f56038abe2858c6448e8642b13423097e -SIZE (apache-ant-1.10.8-bin.tar.bz2) = 5392297 -SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c -SIZE (apache-ant-manpage-20030908.tgz) = 9735 -SHA256 (apache-ant-1.10.8-manual.tar.bz2) = 044d8be4f37b5a84ce5255ea6c4db95a38c35548e32fee30a95eebb80dd038ab -SIZE (apache-ant-1.10.8-manual.tar.bz2) = 2516971 +TIMESTAMP = 1686750989 +SHA256 (apache-ant-1.10.13-bin.tar.bz2) = 7ce1f5c85739e0e690eb54df13df2b919388a47370924212622717b2b84060c1 +SIZE (apache-ant-1.10.13-bin.tar.bz2) = 5182677 +SHA256 (ant_1.10.13-1.debian.tar.xz) = 30517cb1c5837ddb186d7d31c1586bf1943f34531e88d8dca3aebdf28fe5175e +SIZE (ant_1.10.13-1.debian.tar.xz) = 20632 +SHA256 (apache-ant-1.10.13-manual.tar.bz2) = 125b012247262083094c76ade795940e47b34286c1a49d7fb755c557439490a7 +SIZE (apache-ant-1.10.13-manual.tar.bz2) = 2283655 diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist index bbc27ff59eb3..31c3e1f65518 100644 --- a/devel/apache-ant/pkg-plist +++ b/devel/apache-ant/pkg-plist @@ -40,6 +40,8 @@ %%DATADIR%%/lib/ant-imageio.pom %%DATADIR%%/lib/ant-jai.jar %%DATADIR%%/lib/ant-jai.pom +%%DATADIR%%/lib/ant-jakartamail.jar +%%DATADIR%%/lib/ant-jakartamail.pom %%DATADIR%%/lib/ant-javamail.jar %%DATADIR%%/lib/ant-javamail.pom %%DATADIR%%/lib/ant-jdepend.jar