- Remove mentions of X11BASE
This commit is contained in:
parent
c9cbc2f518
commit
0d015c9767
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=31758
1 changed files with 12 additions and 28 deletions
|
|
@ -5372,12 +5372,12 @@ USE_GL= glu</programlisting>
|
|||
|
||||
<example id="using-x11-vars">
|
||||
<title>Using X11 related variables in port</title>
|
||||
<programlisting># Use X11 libraries and depend on
|
||||
<programlisting># Use some X11 libraries and depend on
|
||||
# font server as well as cyrillic fonts.
|
||||
RUN_DEPENDS= ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT} \
|
||||
${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
|
||||
RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
|
||||
${LOCALBASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
|
||||
|
||||
USE_XLIB= yes</programlisting>
|
||||
USE_XORG= x11 xpm</programlisting>
|
||||
</example>
|
||||
|
||||
</sect2>
|
||||
|
|
@ -5430,7 +5430,7 @@ USE_XLIB= yes</programlisting>
|
|||
<title>X11 fonts</title>
|
||||
|
||||
<para>If your port installs fonts for the X Window System, put them in
|
||||
<filename><makevar>X11BASE</makevar>/lib/X11/fonts/local</filename>.<para>
|
||||
<filename><makevar>LOCALBASE</makevar>/lib/X11/fonts/local</filename>.<para>
|
||||
|
||||
</sect2>
|
||||
|
||||
|
|
@ -5853,8 +5853,8 @@ do-configure:
|
|||
add directories to the include and library searchpaths
|
||||
via the commandline, for example:</para>
|
||||
|
||||
<programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${X11BASE}/include \
|
||||
LIBS+=-L${X11BASE}/lib sillyapp.pro</programlisting>
|
||||
<programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
|
||||
LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
@ -7553,7 +7553,7 @@ PLIST_SUB+= VERSION="${VER_STR}"
|
|||
<row>
|
||||
<entry><literal>relative</literal></entry>
|
||||
|
||||
<entry><literal>--with-wx=${X11BASE}
|
||||
<entry><literal>--with-wx=${LOCALBASE}
|
||||
--with-wx-config=${WX_CONFIG:T}</literal></entry>
|
||||
</row>
|
||||
</tbody>
|
||||
|
|
@ -8227,9 +8227,8 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
|
|||
<literal>. %%RC_SUBR%%</literal>, because older versions of &os;
|
||||
do not have an <filename>/etc/rc.subr</filename> file. Standard
|
||||
<makevar>SUB_LIST</makevar> expansions are used too.
|
||||
Use of the <literal>%%PREFIX%%</literal>,
|
||||
<literal>%%LOCALBASE%%</literal>, and
|
||||
<literal>%%X11BASE%%</literal> expansions is strongly encouraged as well.
|
||||
Use of the <literal>%%PREFIX%%</literal> and
|
||||
<literal>%%LOCALBASE%%</literal> expansions is strongly encouraged as well.
|
||||
More on
|
||||
<makevar>SUB_LIST</makevar> in <link
|
||||
linkend="using-sub-files">the relevant section</link>.</para>
|
||||
|
|
@ -8794,7 +8793,7 @@ etc/orbit.conf.sample
|
|||
with <literal>VALUE</literal> in each file listed in
|
||||
<makevar>SUB_FILES</makevar>. Several common pairs are
|
||||
automatically defined: <makevar>PREFIX</makevar>,
|
||||
<makevar>LOCALBASE</makevar>, <makevar>X11BASE</makevar>,
|
||||
<makevar>LOCALBASE</makevar>,
|
||||
<makevar>DATADIR</makevar>, <makevar>DOCSDIR</makevar>,
|
||||
<makevar>EXAMPLESDIR</makevar>. Any line beginning with
|
||||
<literal>@comment</literal> will be deleted from resulting files
|
||||
|
|
@ -8915,10 +8914,6 @@ as .putsy.conf and edit it.</programlisting>
|
|||
<para>The value of <makevar>PREFIX</makevar> will be set
|
||||
to <makevar>LOCALBASE</makevar> (default
|
||||
<filename>/usr/local</filename>). If
|
||||
<makevar>USE_X_PREFIX</makevar> or <makevar>USE_IMAKE</makevar> is
|
||||
set, <makevar>PREFIX</makevar> will be <makevar>X11BASE</makevar>
|
||||
(default <makevar>LOCALBASE</makevar> for compatibility reasons,
|
||||
but it is going to be completely removed later). If
|
||||
<makevar>USE_LINUX_PREFIX</makevar> is set, <makevar>PREFIX</makevar>
|
||||
will be <makevar>LINUXBASE</makevar> (default
|
||||
<filename>/compat/linux</filename>).</para>
|
||||
|
|
@ -8951,10 +8946,6 @@ as .putsy.conf and edit it.</programlisting>
|
|||
<filename>/var/tmp/$(make -V PORTNAME)</filename>
|
||||
to do that while you have it installed would do that.</para>
|
||||
|
||||
<para>Do not set <makevar>USE_X_PREFIX</makevar> unless your port
|
||||
truly requires it (i.e., it needs to
|
||||
reference files in <makevar>X11BASE</makevar>).</para>
|
||||
|
||||
<para>The variable <makevar>PREFIX</makevar> can be reassigned in your
|
||||
<filename>Makefile</filename> or in the user's environment.
|
||||
However, it is strongly discouraged for individual ports to set this
|
||||
|
|
@ -12149,12 +12140,6 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
|
|||
<literal>/usr/local/</literal>)</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><makevar>X11BASE</makevar></entry>
|
||||
<entry>The base of the <quote>X11</quote> tree (e.g.,
|
||||
<literal>/usr/X11R6</literal>)</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><makevar>PREFIX</makevar></entry>
|
||||
<entry>Where the port installs itself (see <link
|
||||
|
|
@ -12447,8 +12432,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
|
|||
|
||||
<listitem>
|
||||
<para>installs files outside of
|
||||
<filename>${LOCALBASE}</filename> and
|
||||
<filename>${X11BASE}</filename></para>
|
||||
<filename>${LOCALBASE}</filename></para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue