Update the port to Saxon-HE 9.3.0.5

4 files changed, 29 insertions, 49 deletions

diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index a00c5048554b..ddd1fb18de05 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -5,67 +5,55 @@
 # $FreeBSD$
 #
 
-PORTNAME=	saxon
-PORTVERSION=	8.9.0.4
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTNAME=	saxon-he
+PORTVERSION=	9.3.0.5
 CATEGORIES=	textproc java
-MASTER_SITES=	SF/${PORTNAME}/Saxon-B/${PORTVERSION}
-PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}j.zip \
-		${PORTNAME}-resources8-9
+MASTER_SITES=	SF/saxon/Saxon-HE/9.3
+DISTNAME=	saxonhe${PORTVERSION:S,.,-,g}j.zip \
+		saxon-resources9-3
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+LICENSE=	MPL
 
-OPTIONS=	JDOM "Install Jdom support" off \
-		XOM "Install XOM support" off
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-CONFLICTS=	saxon-6.*
-
-JARFILES=	saxon8-sql.jar saxon8.jar saxon8-xpath.jar saxon8-dom.jar
-PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-xquery
+JARFILES=	saxon9he.jar
+PLIST_FILES+=	${JARFILES:S,^,%%DATADIR%%/,} bin/saxon-he bin/saxon-he-xquery
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JDOM)
-JARFILES+=	saxon8-jdom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
-.endif
-
-.if defined(WITH_XOM)
-JARFILES+=	saxon8-xom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
 .endif
 
 SUB_FILES=	saxon.sh
-SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
+SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${DATADIR}/,}"
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..."
-	@${MKDIR} ${JAVAJARDIR}
+	@${ECHO_MSG} -n ">> Installing JARs in ${DATADIR}/..."
+	@${MKDIR} ${DATADIR}
 .for file in ${JARFILES}
 	@${ECHO_MSG} -n " ${file}"
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
 	@cd ${WRKSRC}/samples/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
+.endif
+.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
 	@cd ${WRKSRC}/doc/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
@@ -73,18 +61,10 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
-.for scriptfile in saxon saxon-xquery
+.for scriptfile in saxon-he saxon-he-xquery
 	@${ECHO_MSG} -n " ${scriptfile}"
 	@${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${PREFIX}/bin/${scriptfile}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 
-.if !defined(NOPORTDOCS)
-post-install:
-	@${FIND} -s ${WRKSRC}/samples -not -type d | \
-		${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/samples -type d | \
-		${SED} -ne 's,^${WRKSRC}/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/saxon-he/distinfo b/textproc/saxon-he/distinfo
index 611d771a321e..0eca5d106837 100644
--- a/textproc/saxon-he/distinfo
+++ b/textproc/saxon-he/distinfo
@@ -1,4 +1,4 @@
-SHA256 (saxonb8-9-0-4j.zip) = 23e12d90d7990bee4ae715345dc8f555b5aab662710256dec22bed70b3f54058
-SIZE (saxonb8-9-0-4j.zip) = 1492988
-SHA256 (saxon-resources8-9.zip) = bfab671b938047128427acf675d64249f714e40e8e80dc1585df0a2c8840a9bd
-SIZE (saxon-resources8-9.zip) = 10836211
+SHA256 (saxonhe9-3-0-5j.zip) = 791a198fd650b24ccbf94766a236e6e7a6a9dae7c427594a4aa02cdf4a84a2d3
+SIZE (saxonhe9-3-0-5j.zip) = 2075355
+SHA256 (saxon-resources9-3.zip) = 8fa651aa6de7b9cfd8bb01e0b040858a94c0ed42f3433e3958110af90dedad4d
+SIZE (saxon-resources9-3.zip) = 13582452
diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in
index b849bd18e7f4..329e79110535 100644
--- a/textproc/saxon-he/files/saxon.sh.in
+++ b/textproc/saxon-he/files/saxon.sh.in
@@ -4,7 +4,7 @@
 
 IAM="`basename "$0"`"
 
-if [ "${IAM}" = "saxon-xquery" ]
+if [ "${IAM}" = "saxon-he-xquery" ]
 then
 	LAUNCHER_CLASS="net.sf.saxon.Query"
 else
diff --git a/textproc/saxon-he/pkg-descr b/textproc/saxon-he/pkg-descr
index f1c67d88e2eb..9ac4ff22d060 100644
--- a/textproc/saxon-he/pkg-descr
+++ b/textproc/saxon-he/pkg-descr
@@ -1,5 +1,5 @@
-The Saxon 8.0 package is a collection of tools for processing XML documents.
-The main components are:
+Saxon is a collection of tools for processing XML documents.  The main
+components are:
 
 - An XSLT 2.0 processor, that can be used from the command line, or invoked
   from a Java application by use of the standard JAXP API. Saxon can be