Attachment 204405 Details for Bug 237913 – Build ant-1.10.6 from source

[patch] Build ant-1.10.6 from source

apache-ant-from-source2.patch (text/plain), 6.28 KB, created by Mikhail Teterin on 2019-05-16 20:12:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2019-05-16 20:12:26 UTC

Size: 6.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 501752)
>+++ Makefile	(working copy)
>@@ -2,13 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	apache-ant
>-DISTVERSION=	1.10.5
>+DISTVERSION=	1.10.6
> CATEGORIES=	devel java
>-MASTER_SITES=	APACHE/ant/binaries/:bin \
>+MASTER_SITES=	APACHE/ant/source/:src \
> 		LOCAL/hq:man
>-DISTFILES=	${ANT_DISTFILE}:bin \
>+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
>@@ -15,64 +14,72 @@
> 
> LICENSE=	APACHE20
> 
>+BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit
>+
> OPTIONS_DEFINE=	DOCS
> 
>-ANT_DISTFILE=	${PORTNAME}-${DISTVERSION}-bin.tar.bz2
>+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}
> 
>-READMES=	LICENSE README WHATSNEW
>+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}
> 
>-.include <bsd.port.options.mk>
>+NEWANT=	cd ${WRKSRC:Q} &&	\
>+	${SETENV} ANT_HOME=${WRKSRC}/bootstrap ${SH} -x	\
>+		${WRKSRC}/src/script/ant ${ARGUMENTS} --noconfig
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-DISTFILES+=	${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc
>-MASTER_SITES+=	APACHE/ant/manual/:doc
>-PORTDOCS=	*
>-.endif
>+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
>-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/
>+	-@${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}
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+ARGUMENTS+=	-Djavadoc.verbose=true	\
>+		-Ddist.base.manual=${STAGEDIR}${DOCSDIR}	\
>+		-Ddist.javadocs=${STAGEDIR}${DOCSDIR}/api
> 
>-	@${ECHO_MSG} -n ">> Installing readme files..."
>-	@${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>-	@${ECHO_MSG} " [ DONE ]"
>+.else
>+ARGUMENTS+=	-Djavadoc.notrequired=true	\
>+		-Dskip_manuals=false
> 
>-	@${ECHO_MSG} -n ">> Installing documentation files..."
>-	@cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/
>-	@${ECHO_MSG} " [ DONE ]"
>+# 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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 501752)
>+++ distinfo	(working copy)
>@@ -1,7 +1,5 @@
>-TIMESTAMP = 1541311258
>-SHA256 (apache-ant-1.10.5-bin.tar.bz2) = 3f762e16c4b5446e64869d146efe76be865a1d83062eede2d0a8fc11d1e20b2d
>-SIZE (apache-ant-1.10.5-bin.tar.bz2) = 4730768
>+TIMESTAMP = 1557861161
>+SHA256 (apache-ant-1.10.6-src.tar.xz) = a4adf371696089e1730d4f55fd4d0c6f3784dea1eee402fcc981f2330f8d6fc1
>+SIZE (apache-ant-1.10.6-src.tar.xz) = 4267944
> SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c
> SIZE (apache-ant-manpage-20030908.tgz) = 9735
>-SHA256 (apache-ant-1.10.5-manual.tar.bz2) = 5e1804f5d5662d4ada9b84732686f6ac6f6797fc4a9fa7566a30d7fcaba4c6d5
>-SIZE (apache-ant-1.10.5-manual.tar.bz2) = 1994419
>Index: files/patch-build.xml
>===================================================================
>--- files/patch-build.xml	(nonexistent)
>+++ files/patch-build.xml	(working copy)
>@@ -0,0 +1,29 @@
>+--- 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>
>
>Property changes on: files/patch-build.xml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 501752)
>+++ pkg-plist	(working copy)
>@@ -36,6 +36,8 @@
> %%DATADIR%%/lib/ant-commons-logging.pom
> %%DATADIR%%/lib/ant-commons-net.jar
> %%DATADIR%%/lib/ant-commons-net.pom
>+%%DATADIR%%/lib/ant-imageio.jar
>+%%DATADIR%%/lib/ant-imageio.pom
> %%DATADIR%%/lib/ant-jai.jar
> %%DATADIR%%/lib/ant-jai.pom
> %%DATADIR%%/lib/ant-javamail.jar

Actions: View | Diff

Attachments on bug 237913: 204393 | 204405