From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 1 11:50:52 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E5EE16A4CF for ; Thu, 1 Jul 2004 11:50:52 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A6943D45 for ; Thu, 1 Jul 2004 11:50:52 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i61BoKev010520 for ; Thu, 1 Jul 2004 11:50:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i61BoKg4010519; Thu, 1 Jul 2004 11:50:20 GMT (envelope-from gnats) Resent-Date: Thu, 1 Jul 2004 11:50:20 GMT Resent-Message-Id: <200407011150.i61BoKg4010519@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Herve Quiroz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 928BB16A4D1; Thu, 1 Jul 2004 11:50:12 +0000 (GMT) Received: from arabica.esil.univ-mrs.fr (arabica.esil.univ-mrs.fr [139.124.41.108]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7F5343D1D; Thu, 1 Jul 2004 11:50:11 +0000 (GMT) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: from arabica.esil.univ-mrs.fr (localhost.esil.univ-mrs.fr [127.0.0.1])i61Bnj2r033942; Thu, 1 Jul 2004 13:49:45 +0200 (CEST) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: (from rv@localhost)i61Bnjx4033941; Thu, 1 Jul 2004 13:49:45 +0200 (CEST) (envelope-from rv) Message-Id: <200407011149.i61Bnjx4033941@arabica.esil.univ-mrs.fr> Date: Thu, 1 Jul 2004 13:49:45 +0200 (CEST) From: Herve Quiroz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: znerd@FreeBSD.org Subject: ports/68553: [PATCH] textproc/xalan-j: update to 2.6.0 and various improvements X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 11:50:52 -0000 >Number: 68553 >Category: ports >Synopsis: [PATCH] textproc/xalan-j: update to 2.6.0 and various improvements >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 01 11:50:20 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: - Update to 2.6.0 - The shell script to run Xalan-J is now installed (and working) - bsd.java.mk 2.0 compliant - Some cosmetic changes (e.g. ${ECHO} -> ${ECHO_MSG} and ${CHOWN} of documentation directory) - Additional design documentation installed - Updated RUN_DEPENDS NOTE: As I said in a previous PR [1], the autojavadoc Ant target was broken with Java 1.4 and Xalan-J 2.5.1. This issue is now fixed with this release so the API documentation is now always built and installed. NOTE2: I found a shell script in ${FILESDIR} to run Xalan-J on the command-line that was not installed by the port. The existing script was modified. First, the name has changed to 'xalan-j' so there is no conflict with textproc/xalan-c (this will not mislead end-users as the script is not installed in the current version of the port). Second, it now makes use of 'classpath' command from java/javavmwrapper. NOTE3: I added 2 ports to the run dependencies for this port: Xerces-J and javavmwrapper. NOTE4: IMHO the ANT_OPTS statement is not needed as it has no effect on Ant for now (being a Make variable rather than an environement one). Still I didn't remove it... [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/65061 Port maintainer (znerd@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- xalan-j-2.6.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/xalan-j.original/Makefile /usr/ports/textproc/xalan-j/Makefile --- /usr/ports/textproc/xalan-j.original/Makefile Thu Jul 1 11:37:21 2004 +++ /usr/ports/textproc/xalan-j/Makefile Thu Jul 1 12:07:21 2004 @@ -6,18 +6,22 @@ # PORTNAME= xalan-j -PORTVERSION= 2.5.1 +PORTVERSION= 2.6.0 CATEGORIES= textproc java MASTER_SITES= ${MASTER_SITE_APACHE_XML} -MASTER_SITE_SUBDIR= ${PORTNAME}/ +MASTER_SITE_SUBDIR= ${PORTNAME}/source DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}-src MAINTAINER= znerd@FreeBSD.org COMMENT= Apache XSLT processor for transforming XML documents BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant +RUN_DEPENDS= ${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper \ + ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ + ${JAVAJARDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j -USE_JAVA= 1.2+ +USE_JAVA= yes +JAVA_VERSION= 1.2+ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g} ANT?= ${LOCALBASE}/bin/ant @@ -25,29 +29,33 @@ ANT_TARGET= jar .if !defined(NOPORTDOCS) ANT_TARGET+= javadocs -PORTDOCS= apidocs +PORTDOCS= apidocs design .endif JARFILE= xalan.jar -PLIST_FILES= ${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE} - -# FIXME: the autojavadocs Ant target seems broken with Java 1.4 +PLIST_FILES= ${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE} bin/xalan-j do-configure: - ${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/xalan.sh >${WRKDIR}/xalan + @${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${FILESDIR}/xalan.sh >${WRKDIR}/xalan-j do-build: @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} do-install: - @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..." + @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..." @${CP} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/ - @${ECHO} " [ DONE ]" - + @${ECHO_MSG} " [ DONE ]" .if !defined(NOPORTDOCS) - @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..." + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${DOCSDIR} - @${CP} -r ${WRKSRC}/build/docs/apidocs ${DOCSDIR}/ - @${ECHO} " [ DONE ]" +.for DOC in ${PORTDOCS} + @${ECHO_MSG} -n " ${DOC}" + @${CP} -r ${WRKSRC}/build/docs/${DOC} ${DOCSDIR}/ +.endfor + @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + @${ECHO_MSG} " [ DONE ]" .endif + @${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin/..." + @${INSTALL_SCRIPT} ${WRKDIR}/xalan-j ${PREFIX}/bin/ + @${ECHO_MSG} " [ DONE ]" .include diff -ruN --exclude=CVS /usr/ports/textproc/xalan-j.original/distinfo /usr/ports/textproc/xalan-j/distinfo --- /usr/ports/textproc/xalan-j.original/distinfo Thu Jul 1 11:37:21 2004 +++ /usr/ports/textproc/xalan-j/distinfo Thu Jul 1 11:57:17 2004 @@ -1,2 +1,2 @@ -MD5 (xalan-j_2_5_1-src.tar.gz) = a07c12bfb562ecfd9985c3b00ec06328 -SIZE (xalan-j_2_5_1-src.tar.gz) = 5666980 +MD5 (xalan-j_2_6_0-src.tar.gz) = a210f7108e680ab60a11977ec99ab1f9 +SIZE (xalan-j_2_6_0-src.tar.gz) = 5875008 diff -ruN --exclude=CVS /usr/ports/textproc/xalan-j.original/files/xalan.sh /usr/ports/textproc/xalan-j/files/xalan.sh --- /usr/ports/textproc/xalan-j.original/files/xalan.sh Thu Jul 1 11:37:21 2004 +++ /usr/ports/textproc/xalan-j/files/xalan.sh Thu Jul 1 12:14:16 2004 @@ -1,5 +1,4 @@ #!/bin/sh -CLASSDIR=%%PREFIX%%/share/java/classes -exec javavm \ - -classpath ${CLASSDIR}/xml-apis.jar \ - -jar ${CLASSDIR}/xalan.jar "$@" + +export CLASSPATH=`%%PREFIX%%/bin/classpath` +exec javavm org.apache.xalan.xslt.Process $@ --- xalan-j-2.6.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: