svn commit: r416882 - in head/textproc/ant-xinclude-task: . files

[Dmitry Marakasov]

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 at 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 <bsd.port.mk>

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}"