From owner-cvs-ports@FreeBSD.ORG Mon Apr 24 21:05:49 2006 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B2AE16A405; Mon, 24 Apr 2006 21:05:49 +0000 (UTC) (envelope-from jdc@parodius.com) Received: from mx1.parodius.com (mx1.parodius.com [64.62.145.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0195643D45; Mon, 24 Apr 2006 21:05:48 +0000 (GMT) (envelope-from jdc@parodius.com) Received: by mx1.parodius.com (Postfix, from userid 500) id E374F5E36; Mon, 24 Apr 2006 14:05:48 -0700 (PDT) Date: Mon, 24 Apr 2006 14:05:48 -0700 From: Jeremy Chadwick To: Kris Kennaway Message-ID: <20060424210548.GA80839@pentarou.parodius.com> References: <200604241404.k3OE49eJ074318@repoman.freebsd.org> <20060424180431.GA13567@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060424180431.GA13567@xor.obsecurity.org> X-PGP-Key: http://jdc.parodius.com/pubkey.asc User-Agent: Mutt/1.5.11 Cc: cvs-ports@FreeBSD.org, "Andrey A. Chernov" , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/graphics/png/files patch-aa X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 21:05:49 -0000 On Mon, Apr 24, 2006 at 02:04:31PM -0400, Kris Kennaway wrote: > On Mon, Apr 24, 2006 at 02:04:09PM +0000, Andrey A. Chernov wrote: > > ache 2006-04-24 14:04:09 UTC > > > > FreeBSD ports repository > > > > Modified files: > > graphics/png/files patch-aa > > Log: > > Use NO_OBJ NO_PROFILE instead of obsoleted their variants > > > > PR: 96244 > > Submitted by: Jeremy Chadwick > > Are you sure this works on old FreeBSD branches? No, I did not test this. Kris is right -- chances are it won't suffice for 4.x. The modified port builds fine on my 4.x box, but obviously the ports/mk framework is expecting NOOBJ and NOPROFILE there. I don't know of a way to test this (not sure what NOOBJ does, and profiling is completely disabled on all of my machines). One solution for solving this dilemma would be to remove the NOOBJ and NOPROFILE lines completely from ${WRKSRC}/scripts/makefile.freebsd and utilise a check in the port Makefile for ${OSVERSION}, e.g. something like this: .if ${OSVERSION} < 500000 MAKE_ARGS+= -DNOPROFILE -DNOOBJ .else MAKE_ARGS+= -DNO_PROFILE -DNO_OBJ .endif I can come up with a diff/patch for this if need be, since I'm the one responsible for submitting this PR in the first place... -- | Jeremy Chadwick jdc at parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. |