Date: Fri, 16 Jul 2004 17:46:03 +0200 (CEST) From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Greg Lewis <glewis@FreeBSD.org> Subject: ports/69157: [PATCH] textproc/saxon-devel: fix javavm issue Message-ID: <200407161546.i6GFk3Av096090@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200407161550.i6GFoNS0034227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69157
>Category: ports
>Synopsis: [PATCH] textproc/saxon-devel: fix javavm issue
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 16 15:50:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #3: Thu May 6 20:17:47 CEST
>Description:
When a JDK that is not suitable for Saxon 8.0 (version <1.4) has been installed
prior to JDK 1.4+, its entry in ${PREFIX}/etc/javavms is prior to the one of
JDK 1.4+. This means saxon will eventually get run with this JDK and thus won't
work as it requires Java 1.4+.
This patch hardcodes the choice of the Java VM by setting the JAVAVM variable
prior to running javavm.
A more flexible system is underway with the improvements of the
java/javavmwrapper that have been discussed in a couple of PRs lately.
While I'm at it, I've applied a small cosmetic change so that portlint no
longer report false warnings.
I also bumped PORTREVISION as this is a fix.
Greg Lewis is cc'ed as he suggested the fix.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- saxon-devel-8.0_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/saxon-devel.original/Makefile /usr/ports/textproc/saxon-devel/Makefile
--- /usr/ports/textproc/saxon-devel.original/Makefile Fri Jul 16 17:28:04 2004
+++ /usr/ports/textproc/saxon-devel/Makefile Fri Jul 16 17:36:03 2004
@@ -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 @@
.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 -ruN --exclude=CVS /usr/ports/textproc/saxon-devel.original/files/saxon.sh /usr/ports/textproc/saxon-devel/files/saxon.sh
--- /usr/ports/textproc/saxon-devel.original/files/saxon.sh Fri Jul 16 17:28:04 2004
+++ /usr/ports/textproc/saxon-devel/files/saxon.sh Fri Jul 16 17:29:13 2004
@@ -3,4 +3,4 @@
# $FreeBSD: ports/textproc/saxon-devel/files/saxon.sh,v 1.1 2004/07/07 20:36:36 glewis Exp $
export CLASSPATH=`%%PREFIX%%/bin/classpath`
-javavm -jar %%JAVAJARDIR%%/saxon8.jar $@
+JAVAVM=%%JAVAVM%% javavm -jar %%JAVAJARDIR%%/saxon8.jar $@
--- saxon-devel-8.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407161546.i6GFk3Av096090>