Date: Tue, 29 Jun 2010 13:21:07 -0500 From: Paul Schmehl <pschmehl_lists@tx.rr.com> To: Scot Hetzel <swhetzel@gmail.com>, Paul Schmehl <pschmehl_lists@tx.rr.com>, Darren Pilgrim <freebsd@bitfreak.org> Cc: FreeBSD Ports <freebsd-ports@freebsd.org> Subject: Re: This construction doesn't work Message-ID: <1A5EC514D68C6B623B044F88@utd65257.utdallas.edu> In-Reply-To: <AANLkTimNq_7L-_A4oEZRo9aNvb_qUdjEhTbXclcRCWgW@mail.gmail.com> References: <F2F73A9F749C437672E35BFB@utd65257.utdallas.edu> <4C2993E8.8000504@bitfreak.org> <AANLkTimNq_7L-_A4oEZRo9aNvb_qUdjEhTbXclcRCWgW@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--On Tuesday, June 29, 2010 09:02:35 -0500 Scot Hetzel <swhetzel@gmail.com>=20
wrote:
> On Tue, Jun 29, 2010 at 1:34 AM, Darren Pilgrim <freebsd@bitfreak.org> wrote:
>> Paul Schmehl wrote:
>>>
>>> I'm working on a port update for one of the ports that I maintain, and
>>> I've run into a problem that I can't seem to solve.
>>>
>>> I use this construction to ensure that the port doesn't overwrite the conf
>>> file, if one exists:
>>>
>>> .for f in barnyard2.conf
>>> =C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_DATA} ${WRKSRC}/etc/${f} =
${PREFIX}/etc/${f}-sample
>>> =C2=A0 =C2=A0 =C2=A0 =C2=A0[ -f ${PREFIX}/etc/${f} ] || \
>>> =C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_DATA} ${WRKSRC}/etc/${f} =
${PREFIX}/etc/${f}
>>> .endfor
>>>
>>> But it gets overwritten anyway. =C2=A0What am I doing wrong? =C2=A0I =
thought this
>>> worked before, but I can't be sure. =C2=A0Testing proves that it does not =
work
>>> now. =C2=A0I tried to changing to an if [ ! -f construction, but that =
didn't do
>>> a thing.
>
> The above may be working properly, the problem could be that the
> sources have code in them that installs barnyard2.conf to PREFIX/etc/.
> Check the sources Makefile to see if they are installing this file.
> If they are, patch them to install the file as the *-sample.
>
>>
>> Instead of doing this in Makefile, do it in pkg-plist:
>>
>> @unexec if cmp -s %D/etc/barnyard2.conf.sample %D/etc/barnyard2.conf; then
>> rm -f %D/etc/barnyard2.conf; fi
>> etc/barnyard2.conf.sample
>> @exec if [ ! -f %D/etc/barnyard2.conf ] ; then cp -p %D/%F
>> %D/etc/barnyard2.conf && chmod 600 %D/etc/barnyard2.conf; fi
>>
>> Relevant section of the Porter's Handbook:
>>
>> http://www.freebsd.org/doc/en/books/porters-handbook/plist-config.html
>
> While this works when installing a package, you still need code in the
> Makefile to install barnyard2.conf if it doesn't exist when installing
> the port.
You nailed it Scott. The problem was with the Makefile.in in the /etc=20
directory. It's been fixed, and the port upgrade has been submitted.
Thanks for the tipoff.
--=20
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
*******************************************
"It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead." Thomas Jefferson
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1A5EC514D68C6B623B044F88>