From 1f8dcb3677d96af32cb27a09f41993a3a2c59879 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 17 Jul 2004 08:19:44 +0000 Subject: . Alter the saxon.sh script to set the JAVAVM variable to the value chosen by bsd.java.mk during the build. This fixes a problems where the javavmwrapper (used by the script) could have potentially picked an incorrect JDK to use. . Bump PORTREVISION. PR: 69157 Submitted by: Herve Quiroz --- textproc/saxon-devel/Makefile | 5 +++-- textproc/saxon-devel/files/saxon.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'textproc/saxon-devel') diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index b7778e06b5d2..ab827517425d 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -7,11 +7,12 @@ PORTNAME= saxon PORTVERSION= 8.0 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= saxon PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}b${PORTVERSION:S/./-/g} +DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g} MAINTAINER= ports@FreeBSD.org COMMENT= An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java @@ -33,7 +34,7 @@ PORTDOCS= background documentation img index.html javadoc saxon.css .endif do-configure: - @${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \ + @${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; s|%%JAVAVM%%|${JAVA}|g' \ ${FILESDIR}/saxon.sh >${WRKSRC}/saxon do-install: diff --git a/textproc/saxon-devel/files/saxon.sh b/textproc/saxon-devel/files/saxon.sh index 16df51f67582..6ce24f729bc4 100644 --- a/textproc/saxon-devel/files/saxon.sh +++ b/textproc/saxon-devel/files/saxon.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-devel/files/Attic/saxon.sh,v 1.1 2004-07-07 20:36:36 glewis Exp $ +# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-devel/files/Attic/saxon.sh,v 1.2 2004-07-17 08:19:44 glewis Exp $ export CLASSPATH=`%%PREFIX%%/bin/classpath` -javavm -jar %%JAVAJARDIR%%/saxon8.jar $@ +JAVAVM=%%JAVAVM%% javavm -jar %%JAVAJARDIR%%/saxon8.jar $@ -- cgit v1.2.3