- Update to 1.1.3.4.M

- Update to bsd.java.mk 2.0
- Use USE_ANT
- Use %%JAVAJARDIR%%
- CP -> INSTALL_DATA
- ECHO_CMD -> ECHO_MSG
- Link API docs with JDK and XmlPull API docs if available
- Register dependency on textproc/xmlpull

3 files changed, 51 insertions, 25 deletions

diff --git a/textproc/xpp3/Makefile b/textproc/xpp3/Makefile
index 644ec7cffb17..e805cdd6707f 100644
--- a/textproc/xpp3/Makefile
+++ b/textproc/xpp3/Makefile
@@ -6,49 +6,58 @@
 #
 
 PORTNAME=	xpp3
-PORTVERSION=	1.1.3.4d.b4
+PORTVERSION=	1.1.3.4.M
+PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
-DISTNAME=	${DISTNAME_PREFX}_src
+DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	XML Pull Parser 3rd Edition (XPP3)
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS=	${JAVAJARDIR}/xmlpull.jar:${PORTSDIR}/textproc/xmlpull
+RUN_DEPENDS=	${JAVAJARDIR}/xmlpull.jar:${PORTSDIR}/textproc/xmlpull
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 
-DISTNAME_PREFX=	${PORTNAME}-${PORTVERSION:S/d.b/d_b/g}
-WRKSRC=		${WRKDIR}/${DISTNAME_PREFX}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-ANT?=		${LOCALBASE}/bin/ant
-ANT_TARGET=	jar
+USE_ANT=	yes
+ALL_TARGET=	jar
+MAKE_ARGS=	-Djavadoc_packages=org.xmlpull.mxp1
 .if !defined(NOPORTDOCS)
-ANT_TARGET+=	javadoc
+ALL_TARGET+=	javadoc
 PORTDOCS=	api_impl ABOUT.txt THANKS.txt TODO.html build.txt changes.html faq.html
 .endif
-JARFILE=	${DISTNAME_PREFX}.jar
+JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
+PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 
-do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+.include <bsd.port.pre.mk>
+
+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
+
+XMLPULL_API!=	(${FIND} -s ${LOCALBASE}/share/doc/xmlpull -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+.if ${XMLPULL_API} != ""
+MAKE_ARGS+=	-Dxmlpull.api=${XMLPULL_API}
+.endif
 
 do-install:
-	@${ECHO_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${CP} ${WRKSRC}/build/lib/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${INSTALL_DATA} ${WRKSRC}/build/${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/xpp3/distinfo b/textproc/xpp3/distinfo
index 999b3c522fb0..c274d58a75db 100644
--- a/textproc/xpp3/distinfo
+++ b/textproc/xpp3/distinfo
@@ -1,2 +1,2 @@
-MD5 (xpp3-1.1.3.4d_b4_src.tgz) = aea178842db9ab3350c88738a9c0f545
-SIZE (xpp3-1.1.3.4d_b4_src.tgz) = 296155
+MD5 (xpp3-1.1.3.4.M_src.tgz) = 4f3c02abb76368ff29e3bbc30f067dad
+SIZE (xpp3-1.1.3.4.M_src.tgz) = 567986
diff --git a/textproc/xpp3/files/patch-build.xml b/textproc/xpp3/files/patch-build.xml
new file mode 100644
index 000000000000..a848326b482c
--- /dev/null
+++ b/textproc/xpp3/files/patch-build.xml
@@ -0,0 +1,17 @@
+$FreeBSD$
+
+--- build.xml.orig	Thu Jan 27 00:34:33 2005
++++ build.xml	Wed Feb  9 22:34:12 2005
+@@ -496,8 +496,10 @@
+              use="true"
+              windowtitle="${name} ${version} Implementation API"
+              doctitle="Implementation ${name}"
+-             bottom="${copyright}"
+-    />
++             bottom="${copyright}">
++             <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
++             <link offline="true" packagelistLoc="${xmlpull.api}" href="${xmlpull.api}"/>
++    </javadoc>
+   </target>
+ 
+