From owner-freebsd-java@FreeBSD.ORG  Thu Jul  7 04:52:36 2005
Return-Path: <owner-freebsd-java@FreeBSD.ORG>
X-Original-To: java@FreeBSD.org
Delivered-To: freebsd-java@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D4FD616A41C
	for <java@FreeBSD.org>; Thu,  7 Jul 2005 04:52:36 +0000 (GMT)
	(envelope-from mi@blue.virtual-estates.net)
Received: from mail22.sea5.speakeasy.net (mail22.sea5.speakeasy.net
	[69.17.117.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F78B43D45
	for <java@FreeBSD.org>; Thu,  7 Jul 2005 04:52:36 +0000 (GMT)
	(envelope-from mi@blue.virtual-estates.net)
Received: (qmail 30624 invoked from network); 7 Jul 2005 04:52:36 -0000
Received: from aldan.algebra.com ([216.254.65.224])
	(envelope-sender <mi@blue.virtual-estates.net>)
	by mail22.sea5.speakeasy.net (qmail-ldap-1.03) with AES256-SHA
	encrypted SMTP for <java@FreeBSD.org>; 7 Jul 2005 04:52:35 -0000
Received: from blue.virtual-estates.net ([10.0.1.140])
	by aldan.algebra.com (8.13.1/8.13.1) with ESMTP id j674qWO8025295
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 7 Jul 2005 00:52:33 -0400 (EDT)
	(envelope-from mi@blue.virtual-estates.net)
Received: from blue.virtual-estates.net (blue [127.0.0.1])
	by blue.virtual-estates.net (8.13.3/8.13.3) with ESMTP id
	j674qWep077482; Thu, 7 Jul 2005 00:52:32 -0400 (EDT)
	(envelope-from mi@blue.virtual-estates.net)
Received: (from mi@localhost)
	by blue.virtual-estates.net (8.13.3/8.13.3/Submit) id j674qW8c077481;
	Thu, 7 Jul 2005 00:52:32 -0400 (EDT) (envelope-from mi)
From: "Mikhail T." <mi@aldan.algebra.com>
Message-Id: <200507070452.j674qW8c077481@blue.virtual-estates.net>
To: hq@FreeBSD.org, java@FreeBSD.org
Date: Thu, 7 Jul 2005 00:52:32 -0400 (EDT)
X-Face: %UW#n0|w>ydeGt/b@1-.UFP=K^~-:0f#O:D7w<gv/&E-lL7twZCT8B~/PA4|\t$ti+22K">
	hJ5G_<5143Bb3kOIs9XpX+"V+~$adGP:J|SLieM31VIhqXeLBli"<kcG^EOVih
	y+z3/UR{6SCQ
X-Mailer: ELM [version 2.4ME+ PL121h (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: 
Subject: xalan-j and Java-1.5
X-BeenThere: freebsd-java@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: mi@aldan.algebra.com
List-Id: Porting Java to FreeBSD <freebsd-java.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-java>
List-Post: <mailto:freebsd-java@freebsd.org>
List-Help: <mailto:freebsd-java-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2005 04:52:36 -0000

Herve!

According to http://java.sun.com/j2se/1.5.0/compatibility.html ,
Java-1.5 comes with Xerces from Apache, so there is no need to build it
for Xalan's sake if the used Java is of version 1.5

In addition, the xerces-j would not build with 1.5 anyway :-)

Below is a patch for xalan-j -- please, commit or allow me to do so.
There is no need to bump portrevision, because the currently existin
package(s) will not change.

Thanks!

	-mi

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/xalan-j/Makefile,v
retrieving revision 1.18
diff -U2 -r1.18 Makefile
--- Makefile	24 May 2005 18:21:04 -0000	1.18
+++ Makefile	7 Jul 2005 04:51:54 -0000
@@ -16,11 +16,10 @@
 COMMENT=	Apache XSLT processor for transforming XML documents
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper \
-		${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_REINPLACE=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2 1.3 1.4
+JAVA_VERSION=	1.2+
 USE_ANT=	yes
 
@@ -38,4 +37,8 @@
 .include <bsd.port.pre.mk>
 
+.if empty(JAVA_HOME:M*1.5*)
+RUN_DEPENDS+=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+.endif
+
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."