From 1d99e23db6cd47350c3575c393787b087758874b Mon Sep 17 00:00:00 2001 From: Herve Quiroz Date: Mon, 22 Nov 2004 16:49:34 +0000 Subject: - Use MASTER_SITE_SOURCEFORGE - Track the recent changes to java/javavmwrapper - Various cosmetic changes --- textproc/saxon-devel/Makefile | 24 ++++++++++++------------ textproc/saxon-devel/files/saxon.sh | 4 ++-- textproc/saxon-he/Makefile | 24 ++++++++++++------------ textproc/saxon-he/files/saxon.sh | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'textproc') diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index 3804c8c4bb46..6035ba940385 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -8,7 +8,7 @@ PORTNAME= saxon PORTVERSION= 8.1.1 CATEGORIES= textproc java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= saxon PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g} @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g} MAINTAINER= hq@FreeBSD.org COMMENT= An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes @@ -33,12 +33,12 @@ PORTDOCS= background documentation img javadoc .endif do-configure: - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%JAVAVM%%|${JAVA}|g ; \ + @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%SAXON_JARS%%|${JARFILES:S,^,${JAVAJARDIR}/,}|' \ ${FILESDIR}/saxon.sh >${WRKSRC}/saxon do-install: - @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..." + @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..." @${MKDIR} ${JAVAJARDIR} .for file in ${JARFILES} @${ECHO_MSG} -n " ${file}" @@ -46,15 +46,15 @@ do-install: .endfor @${ECHO_MSG} " [ DONE ]" .if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..." - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}/samples/ && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1 + @${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..." + @cd ${WRKSRC}/samples/ \ + && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \ + && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Installing documentation..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1 + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..." + @cd ${WRKSRC}/doc/ \ + && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ + && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; @${ECHO_MSG} " [ DONE ]" .endif @${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..." diff --git a/textproc/saxon-devel/files/saxon.sh b/textproc/saxon-devel/files/saxon.sh index 1865dbc5a793..a220ea908e91 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.4 2004-11-09 16:03:39 hq Exp $ +# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-devel/files/Attic/saxon.sh,v 1.5 2004-11-22 16:49:34 hq Exp $ IAM=`basename "$0"` @@ -17,4 +17,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVAVM="%%JAVAVM%%" "%%LOCALBASE%%/bin/javavm" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile index 3804c8c4bb46..6035ba940385 100644 --- a/textproc/saxon-he/Makefile +++ b/textproc/saxon-he/Makefile @@ -8,7 +8,7 @@ PORTNAME= saxon PORTVERSION= 8.1.1 CATEGORIES= textproc java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= saxon PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g} @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g} MAINTAINER= hq@FreeBSD.org COMMENT= An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes @@ -33,12 +33,12 @@ PORTDOCS= background documentation img javadoc .endif do-configure: - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%JAVAVM%%|${JAVA}|g ; \ + @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%SAXON_JARS%%|${JARFILES:S,^,${JAVAJARDIR}/,}|' \ ${FILESDIR}/saxon.sh >${WRKSRC}/saxon do-install: - @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..." + @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..." @${MKDIR} ${JAVAJARDIR} .for file in ${JARFILES} @${ECHO_MSG} -n " ${file}" @@ -46,15 +46,15 @@ do-install: .endfor @${ECHO_MSG} " [ DONE ]" .if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..." - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}/samples/ && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1 + @${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..." + @cd ${WRKSRC}/samples/ \ + && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \ + && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Installing documentation..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1 + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..." + @cd ${WRKSRC}/doc/ \ + && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ + && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; @${ECHO_MSG} " [ DONE ]" .endif @${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..." diff --git a/textproc/saxon-he/files/saxon.sh b/textproc/saxon-he/files/saxon.sh index 2f8fa270f061..1ec96bf857fd 100644 --- a/textproc/saxon-he/files/saxon.sh +++ b/textproc/saxon-he/files/saxon.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-he/files/Attic/saxon.sh,v 1.4 2004-11-09 16:03:39 hq Exp $ +# $FreeBSD: /tmp/pcvs/ports/textproc/saxon-he/files/Attic/saxon.sh,v 1.5 2004-11-22 16:49:34 hq Exp $ IAM=`basename "$0"` @@ -17,4 +17,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVAVM="%%JAVAVM%%" "%%LOCALBASE%%/bin/javavm" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" -- cgit v1.2.3