5 files changed, 41 insertions, 88 deletions

diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index ab827517425d..215907972a6b 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	saxon
-PORTVERSION=	8.0
-PORTREVISION=	1
+PORTVERSION=	8.1.1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	saxon
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}b${PORTVERSION:S,.,-,g}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hq@FreeBSD.org
 COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
 
 USE_ZIP=	yes
 USE_JAVA=	yes
@@ -28,40 +28,48 @@ NO_BUILD=	yes
 CONFLICTS=	saxon-6.*
 
 JARFILES=	saxon8-sql.jar saxon8-jdom.jar saxon8.jar
-PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon
+PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-xquery
 .if !defined(NOPORTDOCS)
-PORTDOCS=	background documentation img index.html javadoc saxon.css
+PORTDOCS=	background documentation img javadoc
 .endif
 
 do-configure:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; s|%%JAVAVM%%|${JAVA}|g' \
+	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%JAVAVM%%|${JAVA}|g' \
 		${FILESDIR}/saxon.sh >${WRKSRC}/saxon
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..."
 	@${MKDIR} ${JAVAJARDIR}
-.for JARFILE in ${JARFILES}
-	@${ECHO_MSG} -n " ${JARFILE}"
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
+.for file in ${JARFILES}
+	@${ECHO_MSG} -n " ${file}"
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${JAVAJARDIR}/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
 	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/samples/* ${EXAMPLESDIR}/
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/samples/ && ${FIND} . \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${ECHO_MSG} -n " ${DOCFILE}"
-	@${CP} -R ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}/
-.endfor
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@cd ${WRKSRC}/doc/ && ${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} ${WRKSRC}/saxon ${PREFIX}/bin/
+	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
+.for file in saxon saxon-xquery
+	@${ECHO_MSG} -n " ${file}"
+	@${INSTALL_SCRIPT} ${WRKSRC}/saxon ${PREFIX}/bin/${file}
+.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.mk>
diff --git a/textproc/saxon-devel/distinfo b/textproc/saxon-devel/distinfo
index d7a867a34de2..68852ab74fb6 100644
--- a/textproc/saxon-devel/distinfo
+++ b/textproc/saxon-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (saxonb8-0.zip) = d05fbd398847ef27b2d1d875bb5136ea
-SIZE (saxonb8-0.zip) = 5465208
+MD5 (saxonb8-1-1.zip) = c4463c7a437533188c06bb558aa4f1a5
+SIZE (saxonb8-1-1.zip) = 6155706
diff --git a/textproc/saxon-devel/files/saxon.sh b/textproc/saxon-devel/files/saxon.sh
index 6ce24f729bc4..bfbf5eb61bc3 100644
--- a/textproc/saxon-devel/files/saxon.sh
+++ b/textproc/saxon-devel/files/saxon.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-devel/files/Attic/saxon.sh,v 1.2 2004-07-17 08:19:44 glewis Exp $
+# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-devel/files/Attic/saxon.sh,v 1.3 2004-10-27 16:50:43 hq Exp $
 
-export CLASSPATH=`%%PREFIX%%/bin/classpath`
-JAVAVM=%%JAVAVM%% javavm -jar %%JAVAJARDIR%%/saxon8.jar $@
+IAM=`basename "$0"`
+
+if [ "${IAM}" = "saxon-xquery" ]
+then
+	LAUNCHER_CLASS="net.sf.saxon.Query"
+else
+	LAUNCHER_CLASS="net.sf.saxon.Transform"
+fi
+
+JAVAVM=%%JAVAVM%% %%LOCALBASE%%/bin/javavm -classpath "`%%LOCALBASE%%/bin/classpath`" ${LAUNCHER_CLASS} $@
diff --git a/textproc/saxon-devel/pkg-descr b/textproc/saxon-devel/pkg-descr
index 362261376106..f1c67d88e2eb 100644
--- a/textproc/saxon-devel/pkg-descr
+++ b/textproc/saxon-devel/pkg-descr
@@ -19,4 +19,4 @@ So you can use Saxon to process XML by writing XSLT stylesheets, by writing
 XQuery queries, by writing Java applications, or by combinations of the
 approaches.
 
-WWW: http://saxon.sourceforge.net/
+WWW: http://www.saxonica.com/
diff --git a/textproc/saxon-devel/pkg-plist b/textproc/saxon-devel/pkg-plist
deleted file mode 100644
index 8af20892f6d2..000000000000
--- a/textproc/saxon-devel/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/text.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/preamble.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/multidoc.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/inc1/inc2/inc2.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/inc1/inc1.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/foo3.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/foo2.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/foo.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xsl/baz.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xml/subdir1/subdir2/foo3.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xml/subdir1/foo2.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xml/foo.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xml/embedded.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/xml/baz.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/trax/exampleSimple2.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/tour.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/total.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/play.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/identity.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/books.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/books-tle.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/books-sql.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/books-sa.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/books-csv.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/styles/bible.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/query/tour.xq
-%%PORTDOCS%%%%EXAMPLESDIR%%/query/books.xq
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/XPathExample.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/XPathExample.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples$UserURIResolver.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples$UserOutputResolver.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples$ModifyStylesheetFilter.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/TraxExamples$1.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/SaxonServlet.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/SaxonServlet.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/QuickValidator.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/QuickValidator.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/JDOMExample.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/JDOMExample.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/ExampleContentHandler.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/ExampleContentHandler.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/tstmt.dtd
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/play.dtd
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/othello.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/books.xsd
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/books.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/books.dtd
-%%PORTDOCS%%%%EXAMPLESDIR%%/analysis/timing-profile.xsl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xsl/inc1/inc2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xsl/inc1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xsl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xml/subdir1/subdir2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xml/subdir1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax/xml
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/trax
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/styles
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/query
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/analysis
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/