From owner-svn-ports-head@freebsd.org Tue Jun 14 09:05:03 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EBC6AF2712; Tue, 14 Jun 2016 09:05:03 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 350072CF2; Tue, 14 Jun 2016 09:05:03 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5E952te050235; Tue, 14 Jun 2016 09:05:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5E952uZ050233; Tue, 14 Jun 2016 09:05:02 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606140905.u5E952uZ050233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 14 Jun 2016 09:05:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416882 - in head/textproc/ant-xinclude-task: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 09:05:03 -0000 Author: amdmi3 Date: Tue Jun 14 09:05:02 2016 New Revision: 416882 URL: https://svnweb.freebsd.org/changeset/ports/416882 Log: - Fix JAVAJARDIR/JAVALIBDIR misuse - Add NO_ARCH - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/textproc/ant-xinclude-task/Makefile head/textproc/ant-xinclude-task/files/patch-build.xml Modified: head/textproc/ant-xinclude-task/Makefile ============================================================================== --- head/textproc/ant-xinclude-task/Makefile Tue Jun 14 08:29:32 2016 (r416881) +++ head/textproc/ant-xinclude-task/Makefile Tue Jun 14 09:05:02 2016 (r416882) @@ -11,23 +11,26 @@ PKGNAMEPREFIX= ant- MAINTAINER= ports@FreeBSD.org COMMENT= XInclude task for Jakarta Ant -BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:textproc/xincluder +BUILD_DEPENDS= ${JAVALIBDIR}/xincluder.jar:textproc/xincluder USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes - -OPTIONS_DEFINE= DOCS +NO_ARCH= yes ALL_TARGET= jar apidocs PORTDOCS= * -MAKE_ENV= CLASSPATH=${JAVAJARDIR}/xincluder.jar +MAKE_ENV= CLASSPATH=${JAVALIBDIR}/xincluder.jar PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar +OPTIONS_DEFINE= DOCS + do-install: @${MKDIR} ${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/ + +do-install-DOCS-on: cd ${WRKSRC}/build/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/ant-xinclude-task/files/patch-build.xml ============================================================================== --- head/textproc/ant-xinclude-task/files/patch-build.xml Tue Jun 14 08:29:32 2016 (r416881) +++ head/textproc/ant-xinclude-task/files/patch-build.xml Tue Jun 14 09:05:02 2016 (r416882) @@ -1,5 +1,5 @@ ---- build.xml.orig Thu Aug 12 12:17:41 2004 -+++ build.xml Thu Aug 12 12:20:10 2004 +--- build.xml.orig 2003-09-17 10:03:21 UTC ++++ build.xml @@ -144,8 +144,6 @@ windowtitle="${javadoc.title}" doctitle="${javadoc.title}"