From owner-freebsd-ports@FreeBSD.ORG Sat Sep 1 14:48:44 2012 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6391106564A; Sat, 1 Sep 2012 14:48:44 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from mail.ebusiness-leidinger.de (mail.ebusiness-leidinger.de [217.11.53.44]) by mx1.freebsd.org (Postfix) with ESMTP id 3B7408FC0A; Sat, 1 Sep 2012 14:48:44 +0000 (UTC) Received: from outgoing.leidinger.net (p5796D30D.dip.t-dialin.net [87.150.211.13]) by mail.ebusiness-leidinger.de (Postfix) with ESMTPSA id 747BD8444E5; Sat, 1 Sep 2012 16:48:29 +0200 (CEST) Received: from unknown (IO.Leidinger.net [192.168.1.12]) by outgoing.leidinger.net (Postfix) with ESMTPS id D72811727; Sat, 1 Sep 2012 16:48:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=leidinger.net; s=outgoing-alex; t=1346510906; bh=uHFxjxadez4e1YH9+s9jiIq8B/1fqcDHPfSKSWrGB2c=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=y0Pm5sE3P22krYtO8bOP2vJ27W7n3JtM6uaFIzo25zCnmkJhpurve7kqfPAh8YANz GY2tEs9JGNpMJNGK3KZcLAhFy8BYT6fZW54AaDDTfo44JYVsShdAl65YAUpkeYNnI/ vqVY8vrtQZsgXIAt1eA3fnglh7v4bJbzMFC1I9dcc1ESiy7bj44kVG79LqoDK7/uUf bLZlbHovYS/VKD03ZELz6Px6IoTx/RcYc/ZEnaNzdR5tdGcb8cNnMbQ1TA5p5/9tJD R91HtB1MjbCuFpZvJajbdJ/Do5FwKfmjm1d9cwQOFZOyOZ38WkG8QdS+EimUjhxvMr Jwmj28fTikcnA== Date: Sat, 1 Sep 2012 16:48:28 +0200 From: Alexander Leidinger To: Alexander Leidinger Message-ID: <20120901164828.00007be1@unknown> In-Reply-To: <20120829220246.00005c76@unknown> References: <20120826225435.00005a10@unknown> <20120829211753.0000399e@unknown> <20120829214831.000050c8@unknown> <20120829220246.00005c76@unknown> X-Mailer: Claws Mail 3.8.0cvs30 (GTK+ 2.24.10; i586-pc-mingw32msvc) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-EBL-MailScanner-Information: Please contact the ISP for more information X-EBL-MailScanner-ID: 747BD8444E5.A0544 X-EBL-MailScanner: Found to be clean X-EBL-MailScanner-SpamCheck: not spam, spamhaus-ZEN, SpamAssassin (not cached, score=-0.831, required 6, autolearn=disabled, ALL_TRUSTED -1.00, AWL 0.20, DKIM_SIGNED 0.10, DKIM_VALID -0.10, DKIM_VALID_AU -0.10, TW_SV 0.08, T_RP_MATCHES_RCVD -0.01) X-EBL-MailScanner-From: alexander@leidinger.net X-EBL-MailScanner-Watermark: 1347115710.77969@l8BnXizFo4iQa0BEhbsSfg X-EBL-Spam-Status: No Cc: ports@freebsd.org, gcooper@freebsd.org, Eitan Adler , portmgr@freebsd.org Subject: Re: Regression in PREFIX handling in packages 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: Sat, 01 Sep 2012 14:48:44 -0000 On Wed, 29 Aug 2012 22:02:46 +0200 Alexander Leidinger wrote: > And this one is tested (copy&paste, may have lost tabs and add > linebreaks from my mailer): > ---snip--- > # svn diff > Index: perform.c > =================================================================== > --- perform.c (revision 239708) > +++ perform.c (working copy) > @@ -215,10 +215,15 @@ > > /* Prefix should add an @cwd to the packing list */ > if (Prefix) { > - char resolved_prefix[PATH_MAX]; > - if (realpath(Prefix, resolved_prefix) == NULL) > - err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", > Prefix); > - add_plist_top(&plist, PLIST_CWD, resolved_prefix); > + if (Prefix[0] != '/') { > + char resolved_prefix[PATH_MAX]; > + if (realpath(Prefix, resolved_prefix) == NULL) > + err(EXIT_FAILURE, > + "couldn't resolve path for prefix: %s", > Prefix); > + add_plist_top(&plist, PLIST_CWD, resolved_prefix); > + } else { > + add_plist_top(&plist, PLIST_CWD, Prefix); > + } > } > > /* Add the origin if asked, at the top */ > ---snip--- Can I go ahead and commit this? Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137