Index: head/textproc/ant-xinclude-task/Makefile
===================================================================
--- head/textproc/ant-xinclude-task/Makefile	(revision 416881)
+++ head/textproc/ant-xinclude-task/Makefile	(revision 416882)
@@ -1,33 +1,36 @@
 # Created by: Ernst de Haan <znerd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xinclude-task
 PORTVERSION=	0.2
 PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	http://people.freebsd.org/~znerd/xinclude-task/
 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
+NO_ARCH=	yes
 
-OPTIONS_DEFINE=	DOCS
-
 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>
Index: head/textproc/ant-xinclude-task/files/patch-build.xml
===================================================================
--- head/textproc/ant-xinclude-task/files/patch-build.xml	(revision 416881)
+++ head/textproc/ant-xinclude-task/files/patch-build.xml	(revision 416882)
@@ -1,11 +1,11 @@
---- 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}"
  		bottom="${javadoc.footer}">
 -			<link href="http://java.sun.com/j2se/${java.specification.version}/docs/api" />
 -			<link href="http://people.FreeBSD.org/~znerd/ant15-apidocs" />
  		</javadoc>
  	</target>