Attachment #204405 for bug #237913




# $FreeBSD$

PORTNAME=	apache-ant
DISTVERSION=	1.10.6
CATEGORIES=	devel java
MASTER_SITES=	APACHE/ant/source/:src \
		LOCAL/hq:man
DISTFILES=	${ANT_DISTFILE}:src \
		${MANPAGE_DISTFILE}:man
EXTRACT_ONLY=	${ANT_DISTFILE}

MAINTAINER=	java@FreeBSD.org
COMMENT=	Java- and XML-based build tool, conceptually similar to make


LICENSE=	APACHE20

BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit

OPTIONS_DEFINE=	DOCS

ANT_DISTFILE=	${PORTNAME}-${DISTVERSION}-src.tar.xz
MANPAGE_DISTFILE=	${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
MANPAGE_VERSION=	20030908
USES=		tar:bzip2
USE_JAVA=	yes
PORTDOCS=	*

NO_ARCH=	yes
NO_BUILD=	yes
DATADIR=	${JAVASHAREDIR}/${PORTNAME}

MAKE_ENV+=	JAVA_HOME=${JAVA_HOME:Q}
EXTRACT_AFTER_ARGS=	--exclude '*.p[ly]' --exclude='lib/optional'	\
			--exclude '*.cmd' --exclude '*.bat'
ARGUMENTS=	-Dsystem.jars=${JAVALIBDIR}	\
		-Ddist.dir=${STAGEDIR}${PREFIX}	\
		-Ddist.lib=${STAGEDIR}${DATADIR}/lib	\
		-Ddist.etc=${STAGEDIR}${DATADIR}/etc	\
		-Ddist.manual=${STAGEDIR}${DOCSDIR}

NEWANT=	cd ${WRKSRC:Q} &&	\
	${SETENV} ANT_HOME=${WRKSRC}/bootstrap ${SH} -x	\
		${WRKSRC}/src/script/ant ${ARGUMENTS} --noconfig

do-build:
	cd ${WRKSRC:Q} &&	\
		${SETENV} ${MAKE_ENV} ${SH} -x ./bootstrap.sh	\
			-Dsystem.jars=${JAVALIBDIR}
	${NEWANT} jars

MANPAGE_SUBDIR=	apache-ant-manpage
MANPAGE_WRKSRC=	${WRKSRC}/${MANPAGE_SUBDIR}

SUB_FILES=	ant.sh

post-extract:
	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${MANPAGE_DISTFILE}

do-install:
	${NEWANT} dist-internal
	@${ECHO_MSG} -n ">> Installing scripts..."
	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
	@${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant
	-@${MV} ${STAGEDIR}${PREFIX}/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} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1
	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5
	@${ECHO_MSG} " [ DONE ]"

test check:
	${NEWANT} -autoproxy test

MANPAGE_WRKSRC=	${WRKDIR}/apache-ant-manpage

SUB_FILES=	ant.sh

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
ARGUMENTS+=	-Djavadoc.verbose=true	\
		-Ddist.base.manual=${STAGEDIR}${DOCSDIR}	\
		-Ddist.javadocs=${STAGEDIR}${DOCSDIR}/api

.else
ARGUMENTS+=	-Djavadoc.notrequired=true	\
		-Dskip_manuals=false

# Be sure, manual/ exists, but is empty if we aren't installing documentation
EXTRACT_AFTER_ARGS+=	--exclude 'manual'
post-extract:
	${MKDIR} ${WRKSRC}/manual
.endif

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)distinfo (-5 / +3 lines)
1	TIMESTAMP = 1541311258	1	TIMESTAMP = 1557861161
2	SHA256 (apache-ant-1.10.5-bin.tar.bz2) = 3f762e16c4b5446e64869d146efe76be865a1d83062eede2d0a8fc11d1e20b2d	2	SHA256 (apache-ant-1.10.6-src.tar.xz) = a4adf371696089e1730d4f55fd4d0c6f3784dea1eee402fcc981f2330f8d6fc1
3	SIZE (apache-ant-1.10.5-bin.tar.bz2) = 4730768	3	SIZE (apache-ant-1.10.6-src.tar.xz) = 4267944
4	SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c	4	SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c
5	SIZE (apache-ant-manpage-20030908.tgz) = 9735	5	SIZE (apache-ant-manpage-20030908.tgz) = 9735
6	SHA256 (apache-ant-1.10.5-manual.tar.bz2) = 5e1804f5d5662d4ada9b84732686f6ac6f6797fc4a9fa7566a30d7fcaba4c6d5
7	SIZE (apache-ant-1.10.5-manual.tar.bz2) = 1994419




--- build.xml	2019-05-02 13:09:53.000000000 +0000
+++ build.xml	2019-05-15 00:14:35.259380000 +0000
@@ -129,5 +129,5 @@
   -->
   <path id="classpath">
-    <fileset dir="lib/optional" includes="*.jar"/>
+    <fileset dir="${system.jars}" includes="*.jar" excludes="*ant*"/>
   </path>
 
@@ -1065,5 +1065,5 @@
     </copy>
 
-    <copy todir="${dist.dir}">
+    <copy todir="${dist.manual}">
       <fileset dir="${basedir}">
         <include name="CONTRIBUTORS"/>
@@ -1511,5 +1511,5 @@
     <javadoc useexternalfile="yes"
              destdir="${build.javadocs}"
-             failonerror="true"
+             failonerror="false"
              author="true"
              version="true"
@@ -1536,4 +1536,5 @@
       <group title="Ant Utilities" packages="org.apache.tools.ant.util*"/>
       <classpath refid="tests-classpath"/>
+      <classpath refid="classpath"/>
     </javadoc>
   </target>

Lines 36-41 Link Here

(-)pkg-plist (+2 lines)
36	%%DATADIR%%/lib/ant-commons-logging.pom	36	%%DATADIR%%/lib/ant-commons-logging.pom
37	%%DATADIR%%/lib/ant-commons-net.jar	37	%%DATADIR%%/lib/ant-commons-net.jar
38	%%DATADIR%%/lib/ant-commons-net.pom	38	%%DATADIR%%/lib/ant-commons-net.pom
		39	%%DATADIR%%/lib/ant-imageio.jar
		40	%%DATADIR%%/lib/ant-imageio.pom
39	%%DATADIR%%/lib/ant-jai.jar	41	%%DATADIR%%/lib/ant-jai.jar
40	%%DATADIR%%/lib/ant-jai.pom	42	%%DATADIR%%/lib/ant-jai.pom
41	%%DATADIR%%/lib/ant-javamail.jar	43	%%DATADIR%%/lib/ant-javamail.jar

Return to bug 237913

Lines 2-14 Link Here

(-)Makefile (-37 / +44 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= apache-ant	4	PORTNAME= apache-ant
5	DISTVERSION= 1.10.5	5	DISTVERSION= 1.10.6
6	CATEGORIES= devel java	6	CATEGORIES= devel java
7	MASTER_SITES= APACHE/ant/binaries/:bin \	7	MASTER_SITES= APACHE/ant/source/:src \
8	LOCAL/hq:man	8	LOCAL/hq:man
9	DISTFILES= ${ANT_DISTFILE}:bin \	9	DISTFILES= ${ANT_DISTFILE}:src \
10	${MANPAGE_DISTFILE}:man	10	${MANPAGE_DISTFILE}:man
11	EXTRACT_ONLY= ${ANT_DISTFILE}
12		11
13	MAINTAINER= java@FreeBSD.org	12	MAINTAINER= java@FreeBSD.org
14	COMMENT= Java- and XML-based build tool, conceptually similar to make	13	COMMENT= Java- and XML-based build tool, conceptually similar to make
Lines 15-78 Link Here
15		14
16	LICENSE= APACHE20	15	LICENSE= APACHE20
17		16
		17	BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit
		18
18	OPTIONS_DEFINE= DOCS	19	OPTIONS_DEFINE= DOCS
19		20
20	ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-bin.tar.bz2	21	ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-src.tar.xz
21	MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz	22	MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
22	MANPAGE_VERSION= 20030908	23	MANPAGE_VERSION= 20030908
23	USES= tar:bzip2
24	USE_JAVA= yes	24	USE_JAVA= yes
		25	PORTDOCS= *
25		26
26	NO_ARCH= yes	27	NO_ARCH= yes
27	NO_BUILD= yes
28	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	28	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
29		29
30	READMES= LICENSE README WHATSNEW	30	MAKE_ENV+= JAVA_HOME=${JAVA_HOME:Q}
		31	EXTRACT_AFTER_ARGS= --exclude '*.p[ly]' --exclude='lib/optional' \
		32	--exclude '.cmd' --exclude '.bat'
		33	ARGUMENTS= -Dsystem.jars=${JAVALIBDIR} \
		34	-Ddist.dir=${STAGEDIR}${PREFIX} \
		35	-Ddist.lib=${STAGEDIR}${DATADIR}/lib \
		36	-Ddist.etc=${STAGEDIR}${DATADIR}/etc \
		37	-Ddist.manual=${STAGEDIR}${DOCSDIR}
31		38
32	.include <bsd.port.options.mk>	39	NEWANT= cd ${WRKSRC:Q} && \
		40	${SETENV} ANT_HOME=${WRKSRC}/bootstrap ${SH} -x \
		41	${WRKSRC}/src/script/ant ${ARGUMENTS} --noconfig
33		42
34	.if ${PORT_OPTIONS:MDOCS}	43	do-build:
35	DISTFILES+= ${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc	44	cd ${WRKSRC:Q} && \
36	MASTER_SITES+= APACHE/ant/manual/:doc	45	${SETENV} ${MAKE_ENV} ${SH} -x ./bootstrap.sh \
37	PORTDOCS= *	46	-Dsystem.jars=${JAVALIBDIR}
38	.endif	47	${NEWANT} jars
39		48
40	MANPAGE_SUBDIR= apache-ant-manpage
41	MANPAGE_WRKSRC= ${WRKSRC}/${MANPAGE_SUBDIR}
42
43	SUB_FILES= ant.sh
44
45	post-extract:
46	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${MANPAGE_DISTFILE}
47
48	do-install:	49	do-install:
		50	${NEWANT} dist-internal
49	@${ECHO_MSG} -n ">> Installing scripts..."	51	@${ECHO_MSG} -n ">> Installing scripts..."
50	@${MKDIR} ${STAGEDIR}${DATADIR}/bin	52	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
51	@${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant	53	@${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant
52	@${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/	54	-@${MV} ${STAGEDIR}${PREFIX}/bin/antRun ${STAGEDIR}${DATADIR}/bin/
53	@${ECHO_MSG} " [ DONE ]"	55	@${ECHO_MSG} " [ DONE ]"
54
55	.for d in etc lib
56	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
57	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/
58	@${ECHO_MSG} " [ DONE ]"
59	.endfor
60
61	@${ECHO_MSG} -n ">> Installing manpages..."	56	@${ECHO_MSG} -n ">> Installing manpages..."
62	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1	57	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1
63	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5	58	@${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5
64	@${ECHO_MSG} " [ DONE ]"	59	@${ECHO_MSG} " [ DONE ]"
65		60
		61	test check:
		62	${NEWANT} -autoproxy test
		63
		64	MANPAGE_WRKSRC= ${WRKDIR}/apache-ant-manpage
		65
		66	SUB_FILES= ant.sh
		67
		68	.include <bsd.port.options.mk>
		69
66	.if ${PORT_OPTIONS:MDOCS}	70	.if ${PORT_OPTIONS:MDOCS}
67	@${MKDIR} ${STAGEDIR}${DOCSDIR}	71	ARGUMENTS+= -Djavadoc.verbose=true \
		72	-Ddist.base.manual=${STAGEDIR}${DOCSDIR} \
		73	-Ddist.javadocs=${STAGEDIR}${DOCSDIR}/api
68		74
69	@${ECHO_MSG} -n ">> Installing readme files..."	75	.else
70	@${INSTALL_DATA} ${READMES:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	76	ARGUMENTS+= -Djavadoc.notrequired=true \
71	@${ECHO_MSG} " [ DONE ]"	77	-Dskip_manuals=false
72		78
73	@${ECHO_MSG} -n ">> Installing documentation files..."	79	# Be sure, manual/ exists, but is empty if we aren't installing documentation
74	@cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/	80	EXTRACT_AFTER_ARGS+= --exclude 'manual'
75	@${ECHO_MSG} " [ DONE ]"	81	post-extract:
		82	${MKDIR} ${WRKSRC}/manual
76	.endif	83	.endif
77		84
78	.include <bsd.port.mk>	85	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-build.xml (+29 lines)
	1	--- build.xml 2019-05-02 13:09:53.000000000 +0000
	2	+++ build.xml 2019-05-15 00:14:35.259380000 +0000
	3	@@ -129,5 +129,5 @@
	4	-->
	5	<path id="classpath">
	6	- <fileset dir="lib/optional" includes="*.jar"/>
	7	+ <fileset dir="${system.jars}" includes=".jar" excludes="ant*"/>
	8	</path>
	9
	10	@@ -1065,5 +1065,5 @@
	11	</copy>
	12
	13	- <copy todir="${dist.dir}">
	14	+ <copy todir="${dist.manual}">
	15	<fileset dir="${basedir}">
	16	<include name="CONTRIBUTORS"/>
	17	@@ -1511,5 +1511,5 @@
	18	<javadoc useexternalfile="yes"
	19	destdir="${build.javadocs}"
	20	- failonerror="true"
	21	+ failonerror="false"
	22	author="true"
	23	version="true"
	24	@@ -1536,4 +1536,5 @@
	25	<group title="Ant Utilities" packages="org.apache.tools.ant.util*"/>
	26	<classpath refid="tests-classpath"/>
	27	+ <classpath refid="classpath"/>
	28	</javadoc>
	29	</target>