- Update to 2.6.0

- The shell script to run Xalan-J is now installed (and working)
- bsd.java.mk 2.0 compliance
- Use ${ECHO_MSG} rather than ${ECHO}
- Use ${INSTALL_DATA} and ${CPIO} rather than ${CP} [1]
- Additional design documentation installed
- Updated RUN_DEPENDS
- Fixed LOCALBASE/PREFIX issue in RUN_DEPENDS and bin/xalan-j [1]
- Use USE_ANT
- Use %%JAVAJARDIR%%
- Updated pkg-descr (added information and improved text layout)

PR:		68553
Submitted by:	me
Reviewed by:	glewis [1]
Approved by:	znerd (maintainer), glewis (mentor)

4 files changed, 41 insertions, 35 deletions

diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index d57f0d1057fa..5bf910ea51f5 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -6,48 +6,47 @@
 #
 
 PORTNAME=	xalan-j
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6.0
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR=	${PORTNAME}/
+MASTER_SITE_SUBDIR=	${PORTNAME}/source
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}-src
 
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Apache XSLT processor for transforming XML documents
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${JAVAJARDIR:S,^${PREFIX},${LOCALBASE},}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
 
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+USE_ANT=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
-ANT?=		${LOCALBASE}/bin/ant
-ANT_OPTS=	-Xmx16M
-ANT_TARGET=	jar
+ALL_TARGET=	jar
 .if !defined(NOPORTDOCS)
-ANT_TARGET+=	javadocs
-PORTDOCS=	apidocs
+ALL_TARGET+=	javadocs
+PORTDOCS=	apidocs design
 .endif
 JARFILE=	xalan.jar
-PLIST_FILES=	${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE}
-
-# FIXME: the autojavadocs Ant target seems broken with Java 1.4
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} bin/xalan-j
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/xalan.sh >${WRKDIR}/xalan
-
-do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${FILESDIR}/xalan.sh >${WRKDIR}/xalan-j
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${CP} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/
-	@${ECHO} " [ DONE ]"
-
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/build/docs/apidocs ${DOCSDIR}/
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/build/docs && ${FIND} ${PORTDOCS} \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${ECHO_MSG} " [ DONE ]"
 .endif
+	@${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin/..."
+	@${INSTALL_SCRIPT} ${WRKDIR}/xalan-j ${PREFIX}/bin/
+	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.mk>
diff --git a/textproc/xalan-j/distinfo b/textproc/xalan-j/distinfo
index afd7a4fcdbc7..27224bad89bb 100644
--- a/textproc/xalan-j/distinfo
+++ b/textproc/xalan-j/distinfo
@@ -1,2 +1,2 @@
-MD5 (xalan-j_2_5_1-src.tar.gz) = a07c12bfb562ecfd9985c3b00ec06328
-SIZE (xalan-j_2_5_1-src.tar.gz) = 5666980
+MD5 (xalan-j_2_6_0-src.tar.gz) = a210f7108e680ab60a11977ec99ab1f9
+SIZE (xalan-j_2_6_0-src.tar.gz) = 5875008
diff --git a/textproc/xalan-j/files/xalan.sh b/textproc/xalan-j/files/xalan.sh
index 989c966fab05..03716b86c992 100644
--- a/textproc/xalan-j/files/xalan.sh
+++ b/textproc/xalan-j/files/xalan.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-CLASSDIR=%%PREFIX%%/share/java/classes
-exec javavm \
-    -classpath ${CLASSDIR}/xml-apis.jar \
-    -jar ${CLASSDIR}/xalan.jar "$@"
+
+export CLASSPATH=`%%LOCALBASE%%/bin/classpath`:%%JAVAJARDIR%%/xalan.jar
+exec %%LOCALBASE%%/bin/javavm org.apache.xalan.xslt.Process $@
diff --git a/textproc/xalan-j/pkg-descr b/textproc/xalan-j/pkg-descr
index 8cc235ac7aba..da1f2dc837a4 100644
--- a/textproc/xalan-j/pkg-descr
+++ b/textproc/xalan-j/pkg-descr
@@ -1,7 +1,15 @@
-Xalan is an XSLT processor for transforming XML documents into HTML,
-text, or other XML document types. It implements the W3C
-Recommendations for XSL Transformations (XSLT) and the XML Path
-Language (XPath). It can be used from the command line, in an applet
-or a servlet, or as a module in other program.
+Xalan-Java is an XSLT processor for transforming XML documents into HTML, text,
+or other XML document types. It implements the W3C Recommendations for XSL
+Transformations (XSLT) Version 1.0 and the XML Path Language (XPath) Version
+1.0. It can be used from the command line, in an applet or a servlet, or as a
+module in other program.
+
+Xalan-Java recasts Xalan as an implementation of the Transformation API for XML
+(TrAX) interfaces, part of the Java API for XML Processing 1.2. TrAX provides a
+modular framework and a standard API for performing XML transformations, and it
+utilizes system properties to determine which Transformer and which XML parser
+to use.
+
+Xalan-Java also builds on SAX 2 and DOM level 2.
 
 WWW: http://xml.apache.org/xalan-j/