Page MenuHomeFreeBSD
Files F142617703

D20679.diff
No OneTemporary
Actions

D20679.diff
View Options

Index: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -7581,14 +7581,11 @@
<programlisting>OPTIONS_DEFINE= OPT1
-post-patch:
- @${REINPLACE_CMD} -e 's/echo/true/' ${WRKSRC}/Makefile
-
post-patch-OPT1-on:
- @${REINPLACE_CMD} -e '/opt1/d' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${EXAMPLESDIR}/|' ${WRKSRC}/Makefile
post-patch-OPT1-off:
- @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/Makefile</programlisting>
+ @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${PREFIX}/bin/|' ${WRKSRC}/Makefile</programlisting>
<para>is equivalent to:</para>
@@ -7597,11 +7594,10 @@
.include &lt;bsd.port.options.mk&gt;
post-patch:
- @${REINPLACE_CMD} -e 's/echo/true/' ${WRKSRC}/Makefile
.if ${PORT_OPTIONS:MOPT1}
- @${REINPLACE_CMD} -e '/opt1/d' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${EXAMPLESDIR}/|' ${WRKSRC}/Makefile
.else
- @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/opt1/s|/usr/bin/|${PREFIX}/bin/|' ${WRKSRC}/Makefile
.endif</programlisting>
</sect3>
</sect2>
Index: head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
@@ -415,7 +415,13 @@
variable:</para>
<programlisting>post-patch:
- @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile</programlisting>
+
+ <important>
+ <para>Only use &man.sed.1; to replace variable content. You
+ must use patch files instead of &man.sed.1; to replace
+ static content.</para>
+ </important>
<para>Quite often, software being ported uses the CR/LF
convention in source files. This may cause problems with

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 1:23 PM (7 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27849154
Default Alt Text
D20679.diff (2 KB)

Event Timeline