aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhq <hq@FreeBSD.org>2005-05-25 02:21:04 +0800
committerhq <hq@FreeBSD.org>2005-05-25 02:21:04 +0800
commitf8a329e37eeabc0726a6a66e129b6abb19ab853e (patch)
tree6d6085114e54fa7493e6251334b4d2bde3a84aa4
parentd2ad19b138cf7bba28ac53a9e6efb2982a792c90 (diff)
downloadfreebsd-ports-gnome-f8a329e37eeabc0726a6a66e129b6abb19ab853e.tar.gz
freebsd-ports-gnome-f8a329e37eeabc0726a6a66e129b6abb19ab853e.tar.zst
freebsd-ports-gnome-f8a329e37eeabc0726a6a66e129b6abb19ab853e.zip
- Improve launcher shell script (use javavmwrapper 2.0)
- Use SUB_FILES to configure the launcher shell script - Forbid build with JDK 1.5 as I can't find a workaround (yet) - Use ${JAVALIBDIR} for JAR dependencies - Don't try to mkdir ${JAVAJARDIR} as it has been part of mtree for several years now
-rw-r--r--textproc/xalan-j/Makefile17
-rw-r--r--textproc/xalan-j/files/xalan-j.sh.in5
-rw-r--r--textproc/xalan-j/files/xalan.sh4
3 files changed, 15 insertions, 11 deletions
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 6011cf3e8ee3..02ab76e83f51 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -15,11 +15,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}-src
MAINTAINER= hq@FreeBSD.org
COMMENT= Apache XSLT processor for transforming XML documents
-RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
- ${JAVAJARDIR:S,^${PREFIX},${LOCALBASE},}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper \
+ ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+
+USE_REINPLACE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.2 1.3 1.4
USE_ANT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
@@ -31,8 +33,9 @@ PORTDOCS= apidocs design
JARFILE= xalan.jar
PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} bin/xalan-j
-do-configure:
- @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${FILESDIR}/xalan.sh >${WRKDIR}/xalan-j
+SUB_FILES= xalan-j.sh
+
+.include <bsd.port.pre.mk>
do-install:
@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
@@ -47,7 +50,7 @@ do-install:
@${ECHO_MSG} " [ DONE ]"
.endif
@${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin/..."
- @${INSTALL_SCRIPT} ${WRKDIR}/xalan-j ${PREFIX}/bin/
+ @${INSTALL_SCRIPT} ${WRKDIR}/xalan-j.sh ${PREFIX}/bin/xalan-j
@${ECHO_MSG} " [ DONE ]"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/xalan-j/files/xalan-j.sh.in b/textproc/xalan-j/files/xalan-j.sh.in
new file mode 100644
index 000000000000..463d16dae2ab
--- /dev/null
+++ b/textproc/xalan-j/files/xalan-j.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+# $FreeBSD$
+
+export CLASSPATH="`%%LOCALBASE%%/bin/classpath`:%%JAVAJARDIR%%/xalan.jar"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" org.apache.xalan.xslt.Process "$@"
diff --git a/textproc/xalan-j/files/xalan.sh b/textproc/xalan-j/files/xalan.sh
deleted file mode 100644
index 03716b86c992..000000000000
--- a/textproc/xalan-j/files/xalan.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export CLASSPATH=`%%LOCALBASE%%/bin/classpath`:%%JAVAJARDIR%%/xalan.jar
-exec %%LOCALBASE%%/bin/javavm org.apache.xalan.xslt.Process $@