- Update to 8.7

- Use 'exec' in the launcher shell script to comply with Porter's Handbook
  guidelines
- Use OPTIONS to add support for JDom and XOM [1]

PR:		86093 [1]
Suggested by:	Rene Ladan <r.c.ladan@student.tue.nl> [1]

6 files changed, 54 insertions, 16 deletions

diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index c4b7b083765..5fc9f017641 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -6,19 +6,23 @@
 #
 
 PORTNAME=	saxon
-PORTVERSION=	8.6.1
+PORTVERSION=	8.7
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	saxon
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}
+DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}j \
+		${PORTNAME}-resources${PORTVERSION:S,.,-,g}
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
+OPTIONS=	JDOM "Install Jdom support" off \
+		XOM "Install XOM support" off
+
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
@@ -27,12 +31,24 @@ NO_BUILD=	yes
 
 CONFLICTS=	saxon-6.*
 
-JARFILES=	saxon8-sql.jar saxon8.jar
+JARFILES=	saxon8-sql.jar saxon8.jar saxon8-xpath.jar saxon8-dom.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-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
+.endif
+
 SUB_FILES=	saxon.sh
 SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
 
@@ -71,4 +87,4 @@ post-install:
 		${SED} -ne 's,^${WRKSRC}/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/saxon-devel/distinfo b/textproc/saxon-devel/distinfo
index 1295dffe218..0af4ee9735d 100644
--- a/textproc/saxon-devel/distinfo
+++ b/textproc/saxon-devel/distinfo
@@ -1,3 +1,6 @@
-MD5 (saxonb8-6-1.zip) = b2a739108e5925aeb8dcca290c436857
-SHA256 (saxonb8-6-1.zip) = 92216450cce1034920988f5708bca39a344cd1575348c4e4f2851bd940fbf11d
-SIZE (saxonb8-6-1.zip) = 8559099
+MD5 (saxonb8-7j) = 465771690bf10f8a596bfb697e278bce
+SHA256 (saxonb8-7j) = d8bb9d4fda7847fc36c873dfcbbbcad287d1e4a66e5378175da9a85056b83bd8
+SIZE (saxonb8-7j) = 1318634
+MD5 (saxon-resources8-7.zip) = 4504b7c275b6c8f13daac5ae22e221c3
+SHA256 (saxon-resources8-7.zip) = b0d08185b079ed98906a3529cceb89500dbb3b424f9b3990ec8146c3a9b109a9
+SIZE (saxon-resources8-7.zip) = 8925122
diff --git a/textproc/saxon-devel/files/saxon.sh.in b/textproc/saxon-devel/files/saxon.sh.in
index 5732faa6a5b..b849bd18e7f 100644
--- a/textproc/saxon-devel/files/saxon.sh.in
+++ b/textproc/saxon-devel/files/saxon.sh.in
@@ -17,4 +17,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
+JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index c4b7b083765..5fc9f017641 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -6,19 +6,23 @@
 #
 
 PORTNAME=	saxon
-PORTVERSION=	8.6.1
+PORTVERSION=	8.7
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	saxon
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}
+DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}j \
+		${PORTNAME}-resources${PORTVERSION:S,.,-,g}
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
+OPTIONS=	JDOM "Install Jdom support" off \
+		XOM "Install XOM support" off
+
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
@@ -27,12 +31,24 @@ NO_BUILD=	yes
 
 CONFLICTS=	saxon-6.*
 
-JARFILES=	saxon8-sql.jar saxon8.jar
+JARFILES=	saxon8-sql.jar saxon8.jar saxon8-xpath.jar saxon8-dom.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-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
+.endif
+
 SUB_FILES=	saxon.sh
 SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
 
@@ -71,4 +87,4 @@ post-install:
 		${SED} -ne 's,^${WRKSRC}/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/saxon-he/distinfo b/textproc/saxon-he/distinfo
index 1295dffe218..0af4ee9735d 100644
--- a/textproc/saxon-he/distinfo
+++ b/textproc/saxon-he/distinfo
@@ -1,3 +1,6 @@
-MD5 (saxonb8-6-1.zip) = b2a739108e5925aeb8dcca290c436857
-SHA256 (saxonb8-6-1.zip) = 92216450cce1034920988f5708bca39a344cd1575348c4e4f2851bd940fbf11d
-SIZE (saxonb8-6-1.zip) = 8559099
+MD5 (saxonb8-7j) = 465771690bf10f8a596bfb697e278bce
+SHA256 (saxonb8-7j) = d8bb9d4fda7847fc36c873dfcbbbcad287d1e4a66e5378175da9a85056b83bd8
+SIZE (saxonb8-7j) = 1318634
+MD5 (saxon-resources8-7.zip) = 4504b7c275b6c8f13daac5ae22e221c3
+SHA256 (saxon-resources8-7.zip) = b0d08185b079ed98906a3529cceb89500dbb3b424f9b3990ec8146c3a9b109a9
+SIZE (saxon-resources8-7.zip) = 8925122
diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in
index 5732faa6a5b..b849bd18e7f 100644
--- a/textproc/saxon-he/files/saxon.sh.in
+++ b/textproc/saxon-he/files/saxon.sh.in
@@ -17,4 +17,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
+JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"