svn commit: r48913 - in head/en_US.ISO8859-1/books/porters-handbook: makefiles porting-samplem special
Jason Helfman
jgh at FreeBSD.org
Fri Jun 10 23:23:34 UTC 2016
Author: jgh
Date: Fri Jun 10 23:23:32 2016
New Revision: 48913
URL: https://svnweb.freebsd.org/changeset/doc/48913
Log:
- remove applicable ${PORTSDIR} referrences
PR: 210066
Reported by: rwestlun at gmail.com
Modified:
head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Jun 10 23:10:09 2016 (r48912)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Jun 10 23:23:32 2016 (r48913)
@@ -3239,7 +3239,7 @@ ALWAYS_KEEP_DISTFILES= yes
directory in which to find it in case it is not available.
For example,</para>
- <programlisting>LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
+ <programlisting>LIB_DEPENDS= libjpeg.so:graphics/jpeg</programlisting>
<para>will check for a shared jpeg library with any version, and
descend into the <filename>graphics/jpeg</filename>
@@ -3274,8 +3274,8 @@ ALWAYS_KEEP_DISTFILES= yes
<para>For example,</para>
- <programlisting>RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
- xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
+ <programlisting>RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn \
+ xmlcatmgr:textproc/xmlcatmgr</programlisting>
<para>will check if the file or directory
<filename>/usr/local/news/bin/innd</filename> exists, and
@@ -3335,8 +3335,8 @@ ALWAYS_KEEP_DISTFILES= yes
<varname>BUILD_DEPENDS</varname> and
<varname>RUN_DEPENDS</varname>:</para>
- <programlisting>MY_DEPENDS= some:${PORTSDIR}/devel/some \
- other:${PORTSDIR}/lang/other
+ <programlisting>MY_DEPENDS= some:devel/some \
+ other:lang/other
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}</programlisting>
@@ -3358,7 +3358,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional>:<replaceable>target</replaceable></optional>
tuples. For example,</para>
- <programlisting>BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip</programlisting>
+ <programlisting>BUILD_DEPENDS= unzip:archivers/unzip</programlisting>
<para>will check for an executable called
<command>unzip</command>, and descend into the
@@ -3382,7 +3382,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional>:<replaceable>target</replaceable></optional>
tuples. For example,</para>
- <programlisting>FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2</programlisting>
+ <programlisting>FETCH_DEPENDS= ncftp2:net/ncftp2</programlisting>
<para>will check for an executable called
<command>ncftp2</command>, and descend into the
@@ -3403,7 +3403,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional>:<replaceable>target</replaceable></optional>
tuples. For example,</para>
- <programlisting>EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip</programlisting>
+ <programlisting>EXTRACT_DEPENDS= unzip:archivers/unzip</programlisting>
<para>will check for an executable called
<command>unzip</command>, and descend into the
@@ -3433,7 +3433,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional>:<replaceable>target</replaceable></optional>
tuples. For example,</para>
- <programlisting>PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/java/jfc:extract</programlisting>
+ <programlisting>PATCH_DEPENDS= ${NONEXISTENT}:java/jfc:extract</programlisting>
<para>will descend into the <filename>java/jfc</filename>
subdirectory of the ports tree to extract it.</para>
@@ -3560,7 +3560,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
except <varname>LIB_DEPENDS</varname> using this
syntax:</para>
- <programlisting>p5-Spiffy>=0.26:${PORTSDIR}/devel/p5-Spiffy</programlisting>
+ <programlisting>p5-Spiffy>=0.26:devel/p5-Spiffy</programlisting>
<para>The first field contains a dependent package name, which
must match the entry in the package database, a comparison
@@ -3598,7 +3598,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
be saved by specifying the target too. For
instance</para>
- <programlisting>BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract</programlisting>
+ <programlisting>BUILD_DEPENDS= ${NONEXISTENT}:graphics/jpeg:extract</programlisting>
<para>will always descend to the <literal>jpeg</literal> port
and extract it.</para>
@@ -3640,7 +3640,7 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisti
<programlisting>.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/bin/foo)
-LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar
+LIB_DEPENDS= libbar.so:foo/bar
.endif</programlisting>
</example>
@@ -3660,7 +3660,7 @@ LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/b
<programlisting>OPTIONS_DEFINE= BAR
BAR_DESC= Calling cellphones via bar
-BAR_LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar</programlisting>
+BAR_LIB_DEPENDS= libbar.so:foo/bar</programlisting>
</example>
<para>Testing option variables is the correct method. It will
@@ -3972,7 +3972,7 @@ OPTIONS_DEFAULT=FOO
# Will add --with-foo / --without-foo
FOO_CONFIGURE_WITH= foo
-BAR_RUN_DEPENDS= bar:${PORTSDIR}/bar/bar
+BAR_RUN_DEPENDS= bar:bar/bar
.include <bsd.port.mk></programlisting>
</example>
@@ -4019,7 +4019,7 @@ PGSQL_USE= pgsql=yes
# Will add --enable-postgres / --disable-postgres
PGSQL_CONFIGURE_ENABLE= postgres
-ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS= libicuuc.so:devel/icu
# Will add --with-examples / --without-examples
EXAMPLES_CONFIGURE_WITH= examples
@@ -4080,7 +4080,7 @@ EXAMPLES_CONFIGURE_WITH= examples
<title>Wrong Handling of an Option</title>
<programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+= libfoo.so:${PORTSDIR}/devel/foo
+LIB_DEPENDS+= libfoo.so:devel/foo
CONFIGURE_ARGS+= --enable-foo
.endif</programlisting>
</example>
@@ -4098,7 +4098,7 @@ CONFIGURE_ARGS+= --enable-foo
<example xml:id="makefile-options-auto-activation-good">
<title>Correct Handling of an Option</title>
- <programlisting>FOO_LIB_DEPENDS= libfoo.so:${PORTSDIR}/devel/foo
+ <programlisting>FOO_LIB_DEPENDS= libfoo.so:devel/foo
# Will add --enable-foo / --disable-foo
FOO_CONFIGURE_ENABLE= foo</programlisting>
</example>
@@ -4603,8 +4603,8 @@ BIN3_BUILD= no
selected. For example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
-OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a
-OPT1_LIB_DEPENDS_OFF= libb.so:${PORTSDIR}/devel/b</programlisting>
+OPT1_LIB_DEPENDS= liba.so:devel/a
+OPT1_LIB_DEPENDS_OFF= libb.so:devel/b</programlisting>
<para>is equivalent to:</para>
@@ -4613,9 +4613,9 @@ OPT1_LIB_DEPENDS_OFF= libb.so:${PORTSDIR
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MOPT1}
-LIB_DEPENDS+= liba.so:${PORTSDIR}/devel/a
+LIB_DEPENDS+= liba.so:devel/a
.else
-LIB_DEPENDS+= libb.so:${PORTSDIR}/devel/b
+LIB_DEPENDS+= libb.so:devel/b
.endif</programlisting>
</sect3>
Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Fri Jun 10 23:10:09 2016 (r48912)
+++ head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Fri Jun 10 23:23:32 2016 (r48913)
@@ -66,7 +66,7 @@ MAINTAINER= asami at FreeBSD.org
COMMENT= DVI Previewer for the X Window System
[dependencies -- can be empty]
-RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript
+RUN_DEPENDS= gs:print/ghostscript
[this section is for other standard bsd.port.mk variables that do not
belong to any of the above]
Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Jun 10 23:10:09 2016 (r48912)
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Jun 10 23:23:32 2016 (r48913)
@@ -840,7 +840,7 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/subp
<filename>libltdl.so</filename>, add a dependency on
it:</para>
- <programlisting>LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl</programlisting>
+ <programlisting>LIB_DEPENDS= libltdl.so:devel/libltdl</programlisting>
</sect2>
<sect2 xml:id="using-autoconf">
@@ -1148,7 +1148,7 @@ PLIST_SUB+= NLS="@comment "
<example xml:id="use-perl-dependency-example">
<title>Perl Dependency Example</title>
- <programlisting>p5-IO-Tee>=0.64:${PORTSDIR}/devel/p5-IO-Tee</programlisting>
+ <programlisting>p5-IO-Tee>=0.64:devel/p5-IO-Tee</programlisting>
</example>
<para>For Perl ports that install manual pages, the macro
More information about the svn-doc-all
mailing list