Date: Thu, 14 Jun 2007 10:13:19 +0400 From: "Andrew Pantyukhin" <sat@FreeBSD.org> To: "Martin Matuska" <mm@freebsd.org>, cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org, "Renato Botelho" <garga@freebsd.org>, "Beech Rintoul" <beech@freebsd.org>, "Craig Edwards" <brain@inspircd.org> Subject: Re: cvs commit: ports/irc/inspircd Makefile pkg-plist Message-ID: <cb5206420706132313x490ffabawc8b04edd203d3ac2@mail.gmail.com> In-Reply-To: <20070613233906.A678716A558@hub.freebsd.org> References: <200706132339.l5DNd20L087121@repoman.freebsd.org> <20070613233906.A678716A558@hub.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6/14/07, Martin Matuska <mm@freebsd.org> 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 <brain@inspircd.org> (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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cb5206420706132313x490ffabawc8b04edd203d3ac2>