Date: Tue, 25 May 2021 07:02:36 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: FreeBSD Mailing List <freebsd-ports@freebsd.org> Subject: Lot's of REINPLACE_CMD versus patch Message-ID: <CAFDf7UJAbFMbkdcMTG=Ozrnn1F6KKMWi1A6xLFFRi%2B8-Grp%2BzA@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--0000000000005096bb05c3214682
Content-Type: text/plain; charset="UTF-8"
Hello!
I'm working on a new port that have a lot of REINPLACE_CMDs and I'm getting
a lot of warnings saying, e.g.:
"REINPLACE_CMD ran, but did not modify file contents:
NsCDE/config/NsCDE-Font-120dpi.conf.bak.bak.bak.bak"
And this waring shows that this particular file was changed four times!
I'm thinking that REINPLACE_CMD is viable to small changes and for this
port I think that is better change all files manually and then create
patches with "make makepatch'
What do you think?
---
post-patch:
${CP} ${WRKSRC}/NsCDE/libexec/generate_subpanels
${WRKSRC}/generate_subpanels
@${REINPLACE_CMD} -e 's@config/@etc/nscde/@g'
${WRKSRC}/generate_subpanels
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$$\[NSCDE_ROOT\]/share/doc/@'${PREFIX}'/share/doc/nscde/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$$\[NSCDE_ROOT\]/share/icons/@'${PREFIX}'/share/icons/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$$\[NSCDE_ROOT\]/share/@'${DATADIR}'/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD} -e 's@
$$\[NSCDE_ROOT\]/share@'${DATADIR}'@g' {} \;
${FIND} ${WRKSRC}/NsCDE/config ${WRKSRC}/NsCDE/lib/scripts -type f
-exec ${REINPLACE_CMD} -e
's@$$\[NSCDE_ROOT\]/libexec/@'${PREFIX}'/libexec/nscde/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e "s@$$\[NSCDE_ROOT\]/lib/@${PREFIX}/lib/nscde/@g"
{} \;
${FIND} ${WRKSRC}/NsCDE/config ${WRKSRC}/NsCDE/lib/scripts -type f
-exec ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/bin/@'${PREFIX}'/sbin/@g' {}
\;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$$\[NSCDE_ROOT\]/config/@'${ETCDIR}'/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$${NSCDE_ROOT}/share/icons/@'${PREFIX}'/share/icons/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$${NSCDE_ROOT}/share/@'${DATADIR}'/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}
-e 's@$$NSCDE_ROOT/share/@'${DATADIR}'/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.conf' -exec ${MV}
{} {}.sample \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/config \
${WRKSRC}/NsCDE/share/applications -type f -exec
${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/bin@'${PREFIX}'/sbin@g' {} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e 's@
$$NSCDE\_ROOT\/config@'${ETCDIR}'@g' {} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e 's@
$$NSCDE\_ROOT\/libexec@'${PREFIX}'/libexec/nscde@g' {} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$$NSCDE\_ROOT\/lib\/@'${PREFIX}'/lib/nscde/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/share/config_templates \
-type f -exec ${REINPLACE_CMD} -e
's@$$NSCDE\_ROOT\/share\/icons\/@'${PREFIX}'/share/icons/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/share/config_templates \
-type f -exec ${REINPLACE_CMD} -e
's@$$NSCDE\_ROOT\/share\/doc\/@'${PREFIX}'/share/doc/nscde/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib
${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/share/config_templates \
-type f -exec ${REINPLACE_CMD} -e
's@$$NSCDE\_ROOT\/share\/@'${DATADIR}'/@g'
{} \;
${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$${NSCDE_ROOT}/share/icons/@'${PREFIX}'/share/icons/@g' {} \;
${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$${NSCDE_ROOT}/share/@'${DATADIR}'/@g' {} \;
${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$${NSCDE_ROOT}/config/@'${ETCDIR}'/@g' {} \;
${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$${NSCDE_ROOT}/libexec/@'${PREFIX}'/libexec/nscde/@g' {} \;
${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e
's@$${NSCDE_ROOT}/lib/@'${PREFIX}'/lib/nscde/@g' {} \;
${WRKSRC}/NsCDE/bin/ised -c 's/\*FrontPanel: \(.*x.*\), Id
NsCDE-Subpanel\(.*\), Frame 1, PressColorset 27, \\/\*FrontPanel: \1, Id
NsCDE-Subpanel\2, Frame 1, PressColorset 27, \\\n
Icon NsCDE\/FPSubArrowUp.xpm, PressIcon NsCDE\/FPSubArrowDown.xpm, \\/g' -f
"${WRKSRC}/NsCDE/config/NsCDE-FrontPanel.conf.sample"
${FIND} ${WRKSRC}/NsCDE -type f -exec ${REINPLACE_CMD} -e
's@^#!/usr/bin/env
ksh93@#!'${PREFIX}'/bin/ksh93@' {} \;
${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete
( for HLP in ${PREFIX_FILES}; do ${REINPLACE_CMD} -e 's@$${PREFIX}@
'${PREFIX}'@g' ${WRKSRC}/$${HLP}; done )
---
Thanks,
eduardo
--0000000000005096bb05c3214682
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div>Hello!</div><div><br></div><div>I'm working on a =
new port that have a lot of REINPLACE_CMDs and I'm getting a lot of war=
nings saying, e.g.:</div><div>"REINPLACE_CMD ran, but did not modify f=
ile contents: NsCDE/config/NsCDE-Font-120dpi.conf.bak.bak.bak.bak"</di=
v><div><br></div><div>And this waring shows that this particular file was c=
hanged four times!<br></div><div><br></div><div>I'm thinking that REINP=
LACE_CMD is viable to small changes and for this port I think that is bette=
r change all files manually and then create patches with "make makepat=
ch'</div><div><br></div><div>What do you think?</div><div><br></div><di=
v>---</div><div>post-patch:<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${CP} ${WRKSRC}/=
NsCDE/libexec/generate_subpanels ${WRKSRC}/generate_subpanels<br>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 @${REINPLACE_CMD} -e 's@config/@etc/nscde/@g' ${W=
RKSRC}/generate_subpanels<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/=
NsCDE/config -type f -exec ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/shar=
e/doc/@'${PREFIX}'/share/doc/nscde/@g' {} \;<br>=C2=A0 =C2=A0 =
=C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD}=
-e 's@$$\[NSCDE_ROOT\]/share/icons/@'${PREFIX}'/share/icons/@g=
' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/config -=
type f -exec ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/@'${DATA=
DIR}'/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/Ns=
CDE/config -type f -exec ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share@=
'${DATADIR}'@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${=
WRKSRC}/NsCDE/config ${WRKSRC}/NsCDE/lib/scripts -type f -exec ${REINPLACE_=
CMD} -e 's@$$\[NSCDE_ROOT\]/libexec/@'${PREFIX}'/libexec/nscde/=
@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/config=
-type f -exec ${REINPLACE_CMD} -e "s@$$\[NSCDE_ROOT\]/lib/@${PREFIX}/=
lib/nscde/@g" {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/N=
sCDE/config ${WRKSRC}/NsCDE/lib/scripts -type f -exec ${REINPLACE_CMD} -e &=
#39;s@$$\[NSCDE_ROOT\]/bin/@'${PREFIX}'/sbin/@g' {} \;<br>=C2=
=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REI=
NPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/config/@'${ETCDIR}'/@g' =
{} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/config -type f=
-exec ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/share/icons/@'${PREFIX=
}'/share/icons/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${W=
RKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}=
/share/@'${DATADIR}'/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 $=
{FIND} ${WRKSRC}/NsCDE/config -type f -exec ${REINPLACE_CMD} -e 's@$$NS=
CDE_ROOT/share/@'${DATADIR}'/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =
=C2=A0 ${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.conf' -exec =
${MV} {} {}.sample \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCD=
E/bin ${WRKSRC}/NsCDE/lib ${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/config \<=
br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/NsCDE/=
share/applications -type f -exec ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/=
bin@'${PREFIX}'/sbin@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${=
FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib ${WRKSRC}/NsCDE/libexec -type=
f -exec ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/config@'${ETCDIR}=
9;@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/bin =
${WRKSRC}/NsCDE/lib ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} =
-e 's@$$NSCDE\_ROOT\/libexec@'${PREFIX}'/libexec/nscde@g' {=
} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/N=
sCDE/lib ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e 's@$=
$NSCDE\_ROOT\/lib\/@'${PREFIX}'/lib/nscde/@g' {} \;<br>=C2=A0 =
=C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib ${WRKS=
RC}/NsCDE/libexec ${WRKSRC}/NsCDE/share/config_templates \<br>=C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -type f -exec ${REINPLACE_CMD} -=
e 's@$$NSCDE\_ROOT\/share\/icons\/@'${PREFIX}'/share/icons/@g&#=
39; {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/bin ${WRKS=
RC}/NsCDE/lib ${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE/share/config_template=
s \<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -type f -exe=
c ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/share\/doc\/@'${PREFIX}'=
;/share/doc/nscde/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WR=
KSRC}/NsCDE/bin ${WRKSRC}/NsCDE/lib ${WRKSRC}/NsCDE/libexec ${WRKSRC}/NsCDE=
/share/config_templates \<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 -type f -exec ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/share\/@=
'${DATADIR}'/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} $=
{WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e 's@$${NSCDE_RO=
OT}/share/icons/@'${PREFIX}'/share/icons/@g' {} \;<br>=C2=A0 =
=C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPL=
ACE_CMD} -e 's@$${NSCDE_ROOT}/share/@'${DATADIR}'/@g' {} \;=
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/libexec -type f -ex=
ec ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/config/@'${ETCDIR}'/@g=
' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE/libexec =
-type f -exec ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/libexec/@'${PRE=
FIX}'/libexec/nscde/@g' {} \;<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${FIND=
} ${WRKSRC}/NsCDE/libexec -type f -exec ${REINPLACE_CMD} -e 's@$${NSCDE=
_ROOT}/lib/@'${PREFIX}'/lib/nscde/@g' {} \;<br>=C2=A0 =C2=A0 =
=C2=A0 =C2=A0 ${WRKSRC}/NsCDE/bin/ised -c 's/\*FrontPanel: \(.*x.*\), I=
d NsCDE-Subpanel\(.*\), Frame 1, PressColorset 27, \\/\*FrontPanel: \1, Id =
NsCDE-Subpanel\2, Frame 1, PressColorset 27, \\\n<br>Icon NsCDE\/FPSubArrow=
Up.xpm, PressIcon NsCDE\/FPSubArrowDown.xpm, \\/g' -f "${WRKSRC}/N=
sCDE/config/NsCDE-FrontPanel.conf.sample"<br>=C2=A0 =C2=A0 =C2=A0 =C2=
=A0 ${FIND} ${WRKSRC}/NsCDE -type f -exec ${REINPLACE_CMD} -e 's@^#!/us=
r/bin/env ksh93@#!'${PREFIX}'/bin/ksh93@' {} \;<br>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -de=
lete<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ( for HLP in ${PREFIX_FILES}; do ${REIN=
PLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/$${HLP=
}; done )</div><div>---</div><div><br></div><div>Thanks,</div><div>eduardo<=
br></div></div>
--0000000000005096bb05c3214682--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJAbFMbkdcMTG=Ozrnn1F6KKMWi1A6xLFFRi%2B8-Grp%2BzA>