- Update to bsd.java.mk 2.0

- Use USE_ANT
- Use %%JAVAJARDIR%%
- CP -> INSTALL_DATA
- ECHO_CMD -> ECHO_MSG
- Build 'apidoc' rather than 'javadoc'
- Link API docs with JDK API docs if available
- Bump PORTREVISION

2 files changed, 39 insertions, 21 deletions

diff --git a/textproc/xmlpull/Makefile b/textproc/xmlpull/Makefile
index 9405c11..f9a7565 100644
--- a/textproc/xmlpull/Makefile
+++ b/textproc/xmlpull/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlpull
 PORTVERSION=	1.1.3.4a
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.xmlpull.org/v1/download/
 DISTNAME=	${DISTNAME_PREFX}_src
@@ -15,40 +16,41 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Common API for XML Pull Parsing (XmlPull)
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
-
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 DISTNAME_PREFX=	${PORTNAME}_${PORTVERSION:S/./_/g}
 WRKSRC=		${WRKDIR}/${DISTNAME_PREFX}
 
-ANT?=		${LOCALBASE}/bin/ant
-ANT_TARGET=	jar
+USE_ANT=	yes
+ALL_TARGET=	jar
 .if !defined(NOPORTDOCS)
-ANT_TARGET+=	javadoc
+ALL_TARGET+=	apidoc
 PORTDOCS=	ABOUT.txt README_DOWNLOAD.html THANKS.txt addons.html \
-		api_impl build.txt changes.html faq.html features.html \
+		api build.txt changes.html faq.html features.html \
 		javadoc_stylesheet.css properties.html quick_intro.html \
 		quick_write.html run.txt
 .endif
 JARFILE=	${DISTNAME_PREFX}.jar
 DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
+PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
+
+.include <bsd.port.pre.mk>
 
-do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+.if ${JDK_API} != ""
+MAKE_ARGS+=	-Djdk.api=${JDK_API}
+.endif
 
 do-install:
-	@${ECHO_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/build/lib/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	@${INSTALL_DATA} ${WRKSRC}/build/lib/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -r ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}/
-	@${ECHO_CMD} -n " ${DOCFILE}"
-.endfor
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/doc \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/xmlpull/files/patch-build.xml b/textproc/xmlpull/files/patch-build.xml
new file mode 100644
index 0000000..9200210
--- /dev/null
+++ b/textproc/xmlpull/files/patch-build.xml
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- build.xml.orig	Wed Feb  9 22:07:59 2005
++++ build.xml	Wed Feb  9 22:08:01 2005
+@@ -319,8 +319,9 @@
+              windowtitle="${name} ${version} API"
+              doctitle="${name}"
+              bottom="${copyright}"
+-             stylesheetfile="${doc}/javadoc_stylesheet.css"
+-    />
++             stylesheetfile="${doc}/javadoc_stylesheet.css">
++             <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
++    </javadoc>
+   </target>
+ 
+   <!-- =================================================================== -->