Update for port devel/apache-ant to v1.9.3 is available. It contains several bugfixes and enhancements. Furthermore I adopted the Makefile to new options framework (hint from portlint). Note: This PR supersedes PR:178728 "[UPDATE] devel/apache-ant to v1.9.0". Fix: Patch attached with submission follows: How-To-Repeat: n/a
Responsible Changed From-To: freebsd-ports-bugs->freebsd-java Over to maintainer (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-java->jkim I'll take it.
Author: jkim Date: Wed Jan 8 20:39:22 2014 New Revision: 339172 URL: http://svnweb.freebsd.org/changeset/ports/339172 Log: - Update to 1.9.3 and convert NOPORTDOCS to options framework. [1] - Support staging. PR: ports/185588 [1] Modified: head/devel/apache-ant/Makefile head/devel/apache-ant/distinfo head/devel/apache-ant/pkg-plist Modified: head/devel/apache-ant/Makefile ============================================================================== --- head/devel/apache-ant/Makefile Wed Jan 8 20:25:50 2014 (r339171) +++ head/devel/apache-ant/Makefile Wed Jan 8 20:39:22 2014 (r339172) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= apache-ant -PORTVERSION= 1.8.4 +PORTVERSION= 1.9.3 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \ LOCAL/hq:man @@ -17,6 +17,8 @@ LICENSE= APACHE20 RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper +OPTIONS_DEFINE= DOCS + ANT_DISTFILE= ${PORTNAME}-${PORTVERSION}-bin.tar.bz2 MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz MANPAGE_VERSION= 20030908 @@ -29,7 +31,9 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} READMES= LICENSE README WHATSNEW -.if !defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${PORTNAME}-${PORTVERSION}-manual.tar.bz2:doc MASTER_SITES+= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/manual/:doc,} PORTDOCS= * @@ -40,42 +44,38 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER MANPAGE_SUBDIR= apache-ant-manpage MANPAGE_WRKSRC= ${WRKSRC}/${MANPAGE_SUBDIR} -MAN1= ant.1 -MAN5= build.xml.5 - SUB_FILES= ant.sh -NO_STAGE= yes post-extract: @${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${MANPAGE_DISTFILE} do-install: @${ECHO_MSG} -n ">> Installing scripts..." - @${MKDIR} ${DATADIR}/bin - @${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${PREFIX}/bin/ant - @${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${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} ${DATADIR}/ + @cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ @${ECHO_MSG} " [ DONE ]" .endfor @${ECHO_MSG} -n ">> Installing manpages..." - @${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${MAN1PREFIX}/man/man1 - @${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${MAN5PREFIX}/man/man5 + @${INSTALL_MAN} ${MANPAGE_WRKSRC}/ant.1 ${STAGEDIR}${PREFIX}/man/man1 + @${INSTALL_MAN} ${MANPAGE_WRKSRC}/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5 @${ECHO_MSG} " [ DONE ]" -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} -n ">> Installing readme files..." - @${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${DOCSDIR} + @${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing documentation files..." - @cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${DOCSDIR}/ + @cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} " [ DONE ]" .endif Modified: head/devel/apache-ant/distinfo ============================================================================== --- head/devel/apache-ant/distinfo Wed Jan 8 20:25:50 2014 (r339171) +++ head/devel/apache-ant/distinfo Wed Jan 8 20:39:22 2014 (r339172) @@ -1,6 +1,6 @@ -SHA256 (apache-ant-1.8.4-bin.tar.bz2) = aeaed7d5c2b1e73ffc195d713931047ecc113b8c9844df5cbac2797007455069 -SIZE (apache-ant-1.8.4-bin.tar.bz2) = 4257152 +SHA256 (apache-ant-1.9.3-bin.tar.bz2) = ca14a31b2b47edd069624520f64957ad502c0905421da5f46dd41229b8ba4cbf +SIZE (apache-ant-1.9.3-bin.tar.bz2) = 4320310 SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c SIZE (apache-ant-manpage-20030908.tgz) = 9735 -SHA256 (apache-ant-1.8.4-manual.tar.bz2) = d3f47ee52f9b8e75279d259106232da9c3919fb7ea9f9e48bd3f2c7a0303716e -SIZE (apache-ant-1.8.4-manual.tar.bz2) = 1875282 +SHA256 (apache-ant-1.9.3-manual.tar.bz2) = 0e0cbeea81967fb965050eb2b5a917fc96d14d9d94be7584f38c2b5e4d01825e +SIZE (apache-ant-1.9.3-manual.tar.bz2) = 1911505 Modified: head/devel/apache-ant/pkg-plist ============================================================================== --- head/devel/apache-ant/pkg-plist Wed Jan 8 20:25:50 2014 (r339171) +++ head/devel/apache-ant/pkg-plist Wed Jan 8 20:39:22 2014 (r339172) @@ -1,5 +1,7 @@ @comment $FreeBSD$ bin/ant +man/man1/ant.1.gz +man/man5/build.xml.5.gz %%DATADIR%%/bin/antRun %%DATADIR%%/etc/ant-bootstrap.jar %%DATADIR%%/etc/changelog.xsl _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!