From owner-freebsd-ports@FreeBSD.ORG Tue Jun 24 11:46:17 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEEE8106568B for ; Tue, 24 Jun 2008 11:46:17 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from mail35.syd.optusnet.com.au (mail35.syd.optusnet.com.au [211.29.133.51]) by mx1.freebsd.org (Postfix) with ESMTP id 82E0E8FC36 for ; Tue, 24 Jun 2008 11:46:16 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from server.vk2pj.dyndns.org (c122-106-215-175.belrs3.nsw.optusnet.com.au [122.106.215.175]) by mail35.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id m5OBk1hZ023012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 24 Jun 2008 21:46:12 +1000 Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by server.vk2pj.dyndns.org (8.14.2/8.14.2) with ESMTP id m5OBk0tD094205; Tue, 24 Jun 2008 21:46:00 +1000 (EST) (envelope-from peter@server.vk2pj.dyndns.org) Received: (from peter@localhost) by server.vk2pj.dyndns.org (8.14.2/8.14.2/Submit) id m5OBk0Od094204; Tue, 24 Jun 2008 21:46:00 +1000 (EST) (envelope-from peter) Date: Tue, 24 Jun 2008 21:46:00 +1000 From: Peter Jeremy To: Greg Lewis , freebsd-ports@freebsd.org Message-ID: <20080624114600.GJ91036@server.vk2pj.dyndns.org> References: <485DF018.5020703@FreeBSD.org> <485F4B7E.3040905@FreeBSD.org> <485F4EE1.9040603@FreeBSD.org> <485F5582.5040101@FreeBSD.org> <20080623084308.GA51236@wep4017.physik.uni-wuerzburg.de> <485F6585.2040307@FreeBSD.org> <20080623122637.GA51758@wep4017.physik.uni-wuerzburg.de> <485FF948.5080901@FreeBSD.org> <20080623195640.GA99127@misty.eyesbeyond.com> <20080623221651.GA1188@localhost.my.domain> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline In-Reply-To: <20080623221651.GA1188@localhost.my.domain> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.18 (2008-05-17) Cc: Subject: Re: Issues with portmaster X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2008 11:46:18 -0000 --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2008-Jun-24 00:16:51 +0200, Alexey Shuvaev wrote: >> >From a partial reading of the email thread, it looks like the simplest >> thing to do is to just not set BUILD_DEPENDS if it finds an appropriately >> installed JDK. That way it will only set it if it can't find a bootstrap >> JDK and it needs one installed. >>=20 >This is achieved with attached 3-line patch. I have roughly tested it >with "make -V BUILD_DEPENDS". It produces reasonable results on a system >with jdk1.5.0 (no dependency on diablo) and on a system without any >java at all (there is a dependency on diablo).It is trivial, but neverthel= ess, >any real battlefield testing (upgrading real systems, >tinderbox package building)? Review from someone experienced? > >Alexey. >--- Makefile.orig 2008-06-23 10:33:59.000000000 +0200 >+++ Makefile 2008-06-23 10:34:36.000000000 +0200 >@@ -108,9 +108,8 @@ > # if no valid jdk found, set dependency > .if !defined(BOOTSTRAPJDKDIR) > BOOTSTRAPJDKDIR?=3D ${LOCALBASE}/diablo-jdk1.5.0 >-.endif >- > BUILD_DEPENDS+=3D ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jd= k15 >+.endif >=20 > .if defined(WITHOUT_WEB) > MAKE_ENV+=3D DONT_BUILD_DEPLOY=3D"YES" With this patch, portmaster successfully upgraded jdk-1.5.0.14p8,1 to jdk-1.5.0.14p8_2,1, without installing diablo. --=20 Peter Jeremy Please excuse any delays as the result of my ISP's inability to implement an MTA that is either RFC2821-compliant or matches their claimed behaviour. --+HP7ph2BbKc20aGI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEARECAAYFAkhg3ngACgkQ/opHv/APuIe2IwCgkBlA0ueki9hHRXmcoTApTusH IyQAoInhoy05jIbylO2NmN3bUAoWVI+z =UMEQ -----END PGP SIGNATURE----- --+HP7ph2BbKc20aGI--