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

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 <bsd.port.options.mk>
 
 .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