From owner-cvs-ports@FreeBSD.ORG Fri Jun 15 03:40:37 2007 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E3EC16A400; Fri, 15 Jun 2007 03:40:37 +0000 (UTC) (envelope-from brian@Awfulhak.org) Received: from storm.uk.FreeBSD.org (storm.uk.FreeBSD.org [194.242.157.42]) by mx1.freebsd.org (Postfix) with ESMTP id 126AC13C4B0; Fri, 15 Jun 2007 03:40:36 +0000 (UTC) (envelope-from brian@Awfulhak.org) Received: from store.lan.Awfulhak.org (store.lan.Awfulhak.org [172.16.0.35]) by storm.uk.FreeBSD.org (8.14.1/8.14.1) with ESMTP id l5F3eWJX038275; Fri, 15 Jun 2007 04:40:33 +0100 (BST) (envelope-from brian@Awfulhak.org) Received: from store.lan.Awfulhak.org (localhost.localdomain [127.0.0.1]) by localhost (Postfix) with SMTP id 171B61957C69; Fri, 15 Jun 2007 03:40:22 +0000 (GMT) Received: from gw.Awfulhak.org (gw.lan.Awfulhak.org [172.16.0.1]) by store.lan.Awfulhak.org (Postfix) with ESMTP id C40B61957C67; Fri, 15 Jun 2007 03:40:05 +0000 (GMT) Received: from dev.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.14.1/8.14.1) with ESMTP id l5F3eC8A005755; Thu, 14 Jun 2007 20:40:12 -0700 (PDT) (envelope-from brian@Awfulhak.org) Date: Thu, 14 Jun 2007 20:40:11 -0700 From: Brian Somers To: infofarmer@FreeBSD.org Message-ID: <20070614204011.678c3e97@dev.lan.Awfulhak.org> In-Reply-To: References: <200706132339.l5DNd20L087121@repoman.freebsd.org> <20070613233906.A678716A558@hub.freebsd.org> X-Mailer: Claws Mail 2.9.2 (GTK+ 2.10.12; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Martin Matuska , Renato Botelho , ports-committers@FreeBSD.org, sat@FreeBSD.org, cvs-all@FreeBSD.org, cvs-ports@FreeBSD.org, Craig Edwards , Beech Rintoul Subject: Re: cvs commit: ports/irc/inspircd Makefile pkg-plist 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: Fri, 15 Jun 2007 03:40:37 -0000 On Thu, 14 Jun 2007 10:13:19 +0400 "Andrew Pantyukhin" wrote: > > # Configure script is written in perl > > USE_PERL5_BUILD=yes > > @@ -46,5 +48,9 @@ > > @${STRIP_CMD} ${PREFIX}/lib/inspircd/modules/*.so > > @${STRIP_CMD} ${PREFIX}/lib/inspircd/*.so > > @${STRIP_CMD} ${PREFIX}/bin/inspircd > > +.for FILE in censor conf filter helpop motd quotes rules > > + @${TEST} -f ${PREFIX}/etc/inspircd/inspircd.${FILE} || \ > > + ${CP} ${PREFIX}/etc/inspircd/inspircd.${FILE}.example ${PREFIX}/etc/inspircd/inspircd.${FILE} > > +.endfor > > We don't use this type of conditional in ports. It fails > with non-zero status. Instead you should use if;then;fi, > which always exits 0. FWIW (ignoring the content), this syntax is better than 'if'. As you say, 'if' always succeeds, however 'x || y' will succeed if x, otherwise will run y, returning the result to make. Above, copy failures fail as expected. If 'if' were used they would not (unless you use 'set -e; if ...'). -- Brian Somers Don't _EVER_ lose your sense of humour !