From owner-freebsd-java  Sun Feb 24  7:55:17 2002
Delivered-To: freebsd-java@freebsd.org
Received: from blue.eslitebooks.com (211-23-184-179.eslitebooks.com [211.23.184.179])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0F00F37B400; Sun, 24 Feb 2002 07:55:01 -0800 (PST)
Received: from malloc.eb.kliev.net (pc186.office.eslite [192.168.7.186])
	by blue.eslitebooks.com (8.12.2/8.12.2) with SMTP id g1OFsxPF012342;
	Sun, 24 Feb 2002 23:54:59 +0800
Received: (nullmailer pid 83039 invoked by uid 1000);
	Sun, 24 Feb 2002 15:54:51 -0000
Date: Sun, 24 Feb 2002 23:54:51 +0800
From: Clive Lin <clive@tongi.org>
To: znerd@FreeBSD.org
Cc: freebsd-java@FreeBSD.org
Subject: jakarta-tomcat port
Message-ID: <20020224155451.GA83007@malloc.eb.kliev.net>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="azLHFNyN32YCQGCU"
Content-Disposition: inline
User-Agent: Mutt/1.3.27i
X-Operating-System: FreeBSD 4.5-RELEASE i386
X-PGP-key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA008C03E
Sender: owner-freebsd-java@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-java.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-java>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-java>
X-Loop: FreeBSD.org


--azLHFNyN32YCQGCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

    I think this patch is tiny but essential.. Inclusion of
tools.jar should be after awareness of JAVA_HOME, for people like me
do not like to pollute environment variables with JAVA* ;) How do you
think ?

- -- 
PGP key in header X-PGP-key. Mutt users simply do |gpg --verify would be
fine. Win32 users please google for "pgp freeware."
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org

iD8DBQE8eQytdFUoBaAIwD4RAmngAJ44MBDlBNlS2VsXR2DHEVaJCBhpywCeM6B0
rPoqgZVHWFk6CN9gsixofW0=
=yVtz
-----END PGP SIGNATURE-----

--azLHFNyN32YCQGCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="tomcat.diff"

Index: files/tomcatctl
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat/files/tomcatctl,v
retrieving revision 1.4
diff -u -r1.4 tomcatctl
--- files/tomcatctl	21 Feb 2002 20:06:55 -0000	1.4
+++ files/tomcatctl	24 Feb 2002 15:45:10 -0000
@@ -16,14 +16,14 @@
 		CLASSPATH=$i
 	fi
 done
-if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then
-	CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
-fi
 
 # Check if the JAVA_HOME directory is defined, otherwise set it to the
 # fallback default
 if [ "${JAVA_HOME}a" = "a" ]; then
 	JAVA_HOME=%%JAVA_HOME%%
+fi
+if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then
+	CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
 fi
 JAVA_CMD=${JAVA_HOME}/bin/java
 

--azLHFNyN32YCQGCU--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-java" in the body of the message