Attachment #239364 for bug #268843




PORTNAME=	apache-ant
DISTVERSION=	1.10.12
CATEGORIES=	devel java
MASTER_SITES=	APACHE/ant/binaries:bin \
		http://deb.debian.org/debian/pool/main/a/ant/:man
DISTFILES=	${ANT_DISTFILE}:bin \
		${MANPAGE_DISTFILE}:man
EXTRACT_ONLY=	${ANT_DISTFILE}

CPE_PRODUCT=	ant
USE_JAVA=	yes

OPTIONS_DEFINE=	DOCS

ANT_DISTFILE=	${PORTNAME}-${DISTVERSION}-bin.tar.bz2
MANPAGE_DISTFILE=	ant_${DISTVERSION}-${MANPAGE_VERSION}.debian.tar.xz
MANPAGE_VERSION=	3

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+=	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} -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/
	@${ECHO_MSG} " [ DONE ]"

.for d in etc lib
	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/
	@${ECHO_MSG} " [ DONE ]"
.endfor

	@${ECHO_MSG} -n ">> Installing manpages..."
	${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}

	@${ECHO_MSG} -n ">> Installing readme files..."
	${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
	@${ECHO_MSG} " [ DONE ]"

	@${ECHO_MSG} -n ">> Installing documentation files..."
	cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/
	@${ECHO_MSG} " [ DONE ]"
.endif


Lines 1-7 Link Here

(-)b/devel/apache-ant/distinfo (-8 / +7 lines)
1	TIMESTAMP = 1595160316	1	TIMESTAMP = 1673272356
2	SHA256 (apache-ant-1.10.8-bin.tar.bz2) = 45c1e9992b3ddcaa2f472b5be7ea804f56038abe2858c6448e8642b13423097e	2	SHA256 (apache-ant-1.10.12-bin.tar.bz2) = 276ea73f267a5b1a58f02e2eb5ef594a9b2885e33afb05ef995251d4d18377a6
3	SIZE (apache-ant-1.10.8-bin.tar.bz2) = 5392297	3	SIZE (apache-ant-1.10.12-bin.tar.bz2) = 5424638
4	SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c	4	SHA256 (ant_1.10.12-3.debian.tar.xz) = 7fbe972ec12419107e970cb192adb856aa425186b9908bfa6cf31ad66b99e273
5	SIZE (apache-ant-manpage-20030908.tgz) = 9735	5	SIZE (ant_1.10.12-3.debian.tar.xz) = 20328
6	SHA256 (apache-ant-1.10.8-manual.tar.bz2) = 044d8be4f37b5a84ce5255ea6c4db95a38c35548e32fee30a95eebb80dd038ab	6	SHA256 (apache-ant-1.10.12-manual.tar.bz2) = f1b3969d0978168ebbcefa6571265984ac7da2e9bc6af4aa06050be7a11e6ee6
7	SIZE (apache-ant-1.10.8-manual.tar.bz2) = 2516971	7	SIZE (apache-ant-1.10.12-manual.tar.bz2) = 2560644
8	-

Return to bug 268843

Lines 1-8 Link Here

(-)b/devel/apache-ant/Makefile (-22 / +19 lines)
1	PORTNAME= apache-ant	1	PORTNAME= apache-ant
2	DISTVERSION= 1.10.8	2	DISTVERSION= 1.10.12
3	CATEGORIES= devel java	3	CATEGORIES= devel java
4	MASTER_SITES= https://archive.apache.org/dist/ant/binaries/:bin \	4	MASTER_SITES= APACHE/ant/binaries:bin \
5	LOCAL/hq:man	5	http://deb.debian.org/debian/pool/main/a/ant/:man
6	DISTFILES= ${ANT_DISTFILE}:bin \	6	DISTFILES= ${ANT_DISTFILE}:bin \
7	${MANPAGE_DISTFILE}:man	7	${MANPAGE_DISTFILE}:man
8	EXTRACT_ONLY= ${ANT_DISTFILE}	8	EXTRACT_ONLY= ${ANT_DISTFILE}
Lines 18-78 CPE_VENDOR= apache Link Here
18	CPE_PRODUCT= ant	18	CPE_PRODUCT= ant
19	USE_JAVA= yes	19	USE_JAVA= yes
20		20
21	OPTIONS_DEFINE= DOCS
22
23	ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-bin.tar.bz2	21	ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-bin.tar.bz2
24	MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz	22	MANPAGE_DISTFILE= ant_${DISTVERSION}-${MANPAGE_VERSION}.debian.tar.xz
25	MANPAGE_VERSION= 20030908	23	MANPAGE_VERSION= 3
26		24
		25	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
27	NO_ARCH= yes	26	NO_ARCH= yes
28	NO_BUILD= yes	27	NO_BUILD= yes
29	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
30		28
31	READMES= LICENSE README WHATSNEW	29	READMES= LICENSE README WHATSNEW
32		30
		31	OPTIONS_DEFINE= DOCS
		32
33	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
34		34
35	.if ${PORT_OPTIONS:MDOCS}	35	.if ${PORT_OPTIONS:MDOCS}
36	DISTFILES+= ${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc	36	DISTFILES+= ${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc
37	MASTER_SITES+= https://archive.apache.org/dist/ant/manual/:doc	37	MASTER_SITES+= APACHE/ant/manual:doc
38	PORTDOCS= *	38	PORTDOCS= *
39	.endif	39	.endif
40		40
41	MANPAGE_SUBDIR= apache-ant-manpage
42	MANPAGE_WRKSRC= ${WRKSRC}/${MANPAGE_SUBDIR}
43
44	SUB_FILES= ant.sh	41	SUB_FILES= ant.sh
45		42
46	post-extract:	43	post-extract:
47	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${MANPAGE_DISTFILE}	44	@${TAR} -C ${WRKSRC} -xJf ${DISTDIR}/${MANPAGE_DISTFILE} debian/ant.1 debian/build.xml.5
48		45
49	do-install:	46	do-install:
50	@${ECHO_MSG} -n ">> Installing scripts..."	47	@${ECHO_MSG} -n ">> Installing scripts..."
51	@${MKDIR} ${STAGEDIR}${DATADIR}/bin	48	${MKDIR} ${STAGEDIR}${DATADIR}/bin
52	@${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant	49	${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant
53	@${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/	50	${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/
54	@${ECHO_MSG} " [ DONE ]"	51	@${ECHO_MSG} " [ DONE ]"
55		52
56	.for d in etc lib	53	.for d in etc lib
57	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."	54	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
58	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/	55	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/
59	@${ECHO_MSG} " [ DONE ]"	56	@${ECHO_MSG} " [ DONE ]"
60	.endfor	57	.endfor
61		58
62	@${ECHO_MSG} -n ">> Installing manpages..."	59	@${ECHO_MSG} -n ">> Installing manpages..."
63	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1	60	${INSTALL_MAN} ${WRKSRC}/debian/ant.1 ${STAGEDIR}${PREFIX}/man/man1
64	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5	61	${INSTALL_MAN} ${WRKSRC}/debian/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5
65	@${ECHO_MSG} " [ DONE ]"	62	@${ECHO_MSG} " [ DONE ]"
66		63
67	.if ${PORT_OPTIONS:MDOCS}	64	.if ${PORT_OPTIONS:MDOCS}
68	@${MKDIR} ${STAGEDIR}${DOCSDIR}	65	${MKDIR} ${STAGEDIR}${DOCSDIR}
69		66
70	@${ECHO_MSG} -n ">> Installing readme files..."	67	@${ECHO_MSG} -n ">> Installing readme files..."
71	@${INSTALL_DATA} ${READMES:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	68	${INSTALL_DATA} ${READMES:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
72	@${ECHO_MSG} " [ DONE ]"	69	@${ECHO_MSG} " [ DONE ]"
73		70
74	@${ECHO_MSG} -n ">> Installing documentation files..."	71	@${ECHO_MSG} -n ">> Installing documentation files..."
75	@cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/	72	cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/
76	@${ECHO_MSG} " [ DONE ]"	73	@${ECHO_MSG} " [ DONE ]"
77	.endif	74	.endif
78		75