4 files changed, 18 insertions, 49 deletions

diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 2a39890685ea..733de201b49a 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	saxon
-PORTVERSION=	6.5.3
-PORTREVISION=	1
+PORTVERSION=	6.5.4
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	saxon
-DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/g}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
 
 MAINTAINER=	hq@FreeBSD.org
-COMMENT=	An XSLT processor for Java
+COMMENT=	An XSLT 1.0 processor for Java
 
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.2+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -29,24 +28,18 @@ CONFLICTS=	saxon-devel-8.*
 JARFILES=	saxon-jdom.jar saxon.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon
 .if !defined(NOPORTDOCS)
-PORTDOCS=	api api-guide.html changes.html changes5.html conditions.html \
+PORTDOCS=	api api-guide.html changes.html conditions.html \
 		conformance.html dtdgen.html expressions.html \
-		extensibility.html extensions.html history.html index.html \
-		instant.html patterns.html samples.html saxon-style.css \
-		using-xsl.html xsl-elements.html
+		extensibility.html extensions.html index.html \
+		instant.html limitations.html patterns.html samples.html \
+		saxon-style.css using-xsl.html xsl-elements.html
 .endif
 
-post-extract:
-	@${RMDIR} ${WRKSRC}/samples/ot
-
-do-configure:
-	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%SAXON_JARS%%|${JARFILES:S,^,${JAVAJARDIR}/,}|' \
-		${FILESDIR}/saxon.sh >${WRKSRC}/saxon
+SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
+SUB_FILES=	saxon.sh
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..."
-	@${MKDIR} ${JAVAJARDIR}
 .for JARFILE in ${JARFILES}
 	@${ECHO_MSG} -n " ${JARFILE}"
 	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
@@ -65,7 +58,7 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 	@${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin..."
-	@${INSTALL_SCRIPT} ${WRKSRC}/saxon ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${PREFIX}/bin/saxon
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.mk>
diff --git a/textproc/saxon/distinfo b/textproc/saxon/distinfo
index 043368362c3f..a814ef141ce3 100644
--- a/textproc/saxon/distinfo
+++ b/textproc/saxon/distinfo
@@ -1,2 +1,2 @@
-MD5 (saxon6_5_3.zip) = 7b8c7c187473c04d2abdb40d8ddab5c6
-SIZE (saxon6_5_3.zip) = 3118491
+MD5 (saxon6-5-4.zip) = c32ce951a3c01dca93898a9b7efdcb2f
+SIZE (saxon6-5-4.zip) = 3342978
diff --git a/textproc/saxon/files/saxon.sh b/textproc/saxon/files/saxon.sh.in
index dac9968aa166..3844e62e0bd5 100644
--- a/textproc/saxon/files/saxon.sh
+++ b/textproc/saxon/files/saxon.sh.in
@@ -8,4 +8,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-"%%LOCALBASE%%/bin/javavm" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@"
diff --git a/textproc/saxon/pkg-plist b/textproc/saxon/pkg-plist
index 2059347cd29e..0c73fc7f82d5 100644
--- a/textproc/saxon/pkg-plist
+++ b/textproc/saxon/pkg-plist
@@ -1,31 +1,8 @@
-%%EXAMPLESDIR%%/applet/demo/README.html
-%%EXAMPLESDIR%%/applet/demo/client.html
-%%EXAMPLESDIR%%/applet/demo/foo-s1.xml
-%%EXAMPLESDIR%%/applet/demo/get-todo-list.html
-%%EXAMPLESDIR%%/applet/demo/index.html
-%%EXAMPLESDIR%%/applet/demo/lts3611beac.jpg
-%%EXAMPLESDIR%%/applet/demo/rabbitwhorn.jpg
-%%EXAMPLESDIR%%/applet/demo/s1ToHTML.xsl
-%%EXAMPLESDIR%%/applet/demo/saxonApplets.xml
-%%EXAMPLESDIR%%/applet/demo/simple.html
-%%EXAMPLESDIR%%/applet/demo/target.html
-%%EXAMPLESDIR%%/applet/family-tree/family-tree.html
-%%EXAMPLESDIR%%/applet/family-tree/kennedy.xml
-%%EXAMPLESDIR%%/applet/family-tree/person-applet.xsl
-%%EXAMPLESDIR%%/applet/family-tree/person.xsl
+@comment $FreeBSD$
 %%EXAMPLESDIR%%/data/books.dtd
 %%EXAMPLESDIR%%/data/books.xml
 %%EXAMPLESDIR%%/data/othello.xml
 %%EXAMPLESDIR%%/data/play.dtd
-%%EXAMPLESDIR%%/data/tstmt.dtd
-%%EXAMPLESDIR%%/java/DTDGenerator$1.class
-%%EXAMPLESDIR%%/java/DTDGenerator$AttributeDetails.class
-%%EXAMPLESDIR%%/java/DTDGenerator$CharHandler.class
-%%EXAMPLESDIR%%/java/DTDGenerator$ChildDetails.class
-%%EXAMPLESDIR%%/java/DTDGenerator$ElemHandler.class
-%%EXAMPLESDIR%%/java/DTDGenerator$ElementDetails.class
-%%EXAMPLESDIR%%/java/DTDGenerator.class
-%%EXAMPLESDIR%%/java/DTDGenerator.java
 %%EXAMPLESDIR%%/java/ExampleContentHandler.class
 %%EXAMPLESDIR%%/java/ExampleContentHandler.java
 %%EXAMPLESDIR%%/java/JDOMExample.class
@@ -52,6 +29,8 @@
 %%EXAMPLESDIR%%/styles/books.xsl
 %%EXAMPLESDIR%%/styles/play.xsl
 %%EXAMPLESDIR%%/styles/total.xsl
+%%EXAMPLESDIR%%/styles/tour10.xsl
+%%EXAMPLESDIR%%/styles/tour11.xsl
 %%EXAMPLESDIR%%/trax/exampleSimple2.out
 %%EXAMPLESDIR%%/trax/xml/baz.xml
 %%EXAMPLESDIR%%/trax/xml/embedded.xml
@@ -76,7 +55,4 @@
 @dirrm %%EXAMPLESDIR%%/styles
 @dirrm %%EXAMPLESDIR%%/java
 @dirrm %%EXAMPLESDIR%%/data
-@dirrm %%EXAMPLESDIR%%/applet/family-tree
-@dirrm %%EXAMPLESDIR%%/applet/demo
-@dirrm %%EXAMPLESDIR%%/applet
 @dirrm %%EXAMPLESDIR%%