From owner-cvs-all@FreeBSD.ORG Thu Jun 14 06:13:21 2007 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C9FB16A46D for ; Thu, 14 Jun 2007 06:13:21 +0000 (UTC) (envelope-from infofarmer@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.238]) by mx1.freebsd.org (Postfix) with ESMTP id 931BE13C483 for ; Thu, 14 Jun 2007 06:13:20 +0000 (UTC) (envelope-from infofarmer@gmail.com) Received: by nz-out-0506.google.com with SMTP id 14so402827nzn for ; Wed, 13 Jun 2007 23:13:19 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=cDGwhp7UGFK5DmBAi/1jMKEoxYJPvkgPZ6WWt6vdArf1jeASqT5BXa+sPCwhu4HSonFdlx8EXzRNkg+iuB4fMIlfPCYiT7/YCKeKPBFqSp/y2StHQwbfZXOnmcTGr2cjls2kvqrAF0Bx1VgrEV0C0P9Pav38TQCkFwKsY3N7hn4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=a2uleZZ0O7v9ufYzZRskcA6BUYle0WDGwBFgr/6Vz9LJgFepE8oL30TMf/J84NHI2vYGcO3tRYH+SoKCzS6/k5p8nic6Mz/lXuk9FqdG+Ojuvi330mynxIl/TLDBQs6/A4FUJpy8DoVsKtf0DkHtF5lQZbVGIcuKxtvl0rxNWvA= Received: by 10.115.55.1 with SMTP id h1mr1488923wak.1181801599599; Wed, 13 Jun 2007 23:13:19 -0700 (PDT) Received: by 10.114.194.13 with HTTP; Wed, 13 Jun 2007 23:13:19 -0700 (PDT) Message-ID: Date: Thu, 14 Jun 2007 10:13:19 +0400 From: "Andrew Pantyukhin" Sender: infofarmer@gmail.com To: "Martin Matuska" , cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org, "Renato Botelho" , "Beech Rintoul" , "Craig Edwards" In-Reply-To: <20070613233906.A678716A558@hub.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200706132339.l5DNd20L087121@repoman.freebsd.org> <20070613233906.A678716A558@hub.freebsd.org> X-Google-Sender-Auth: 33aa68b8c43c07a0 Cc: Subject: Re: cvs commit: ports/irc/inspircd Makefile pkg-plist X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: infofarmer@FreeBSD.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2007 06:13:21 -0000 On 6/14/07, Martin Matuska wrote: > mm 2007-06-13 23:39:01 UTC > > FreeBSD ports repository > > Modified files: > irc/inspircd Makefile pkg-plist > Log: > - bugfix: example files install and their pkg-plist entries > - added USE_LDCONFIG entry > > PR: ports/113502 > Submitted by: Craig Edwards (maintainer) > Pointyhat to: sat > Approved by: maintainer, garga (mentor) > > Revision Changes Path > 1.6 +6 -0 ports/irc/inspircd/Makefile > 1.3 +17 -8 ports/irc/inspircd/pkg-plist I assume there was some loss of communication, but this commit could have been preceded by a courtesy ping to me and/or Beech, who have been working on a similar fix. > Index: ports/irc/inspircd/Makefile > diff -u ports/irc/inspircd/Makefile:1.5 ports/irc/inspircd/Makefile:1.6 > --- ports/irc/inspircd/Makefile:1.5 Wed Jun 13 22:05:22 2007 > +++ ports/irc/inspircd/Makefile Wed Jun 13 23:39:01 > @@ -18,6 +19,7 @@ > WRKSRC= ${WRKDIR}/inspircd > USE_GMAKE= yes > USE_BZIP2= yes > +USE_LDCONFIG= ${PREFIX}/lib/inspircd Really? I'd be grateful if you explained why this is needed. > # 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. Finally, you should rethink the meaning of pointy hats before handing them out so easily. I'm generous to issue them to myself and happy when others fix my mess and give me one. This commit clumsily enables a convenience feature, which has its merit and would have been fixed by Beech in a moment, but was not important altogether. The other part of this commit is a bogus noop.