summaryrefslogtreecommitdiff
path: root/doc/guide
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2016-07-09 16:19:15 +0000
committerrillig <rillig@pkgsrc.org>2016-07-09 16:19:15 +0000
commit28b424c91ab3b85a222e62e673d94d8d3ee0d992 (patch)
treea72c2eb7867802c93e20f8c83ba2377604bbcd66 /doc/guide
parentb66c7a4219962abaf0e1051281618706972ba18b (diff)
downloadpkgsrc-28b424c91ab3b85a222e62e673d94d8d3ee0d992.tar.gz
Removed leading tabs from <programlisting>, to prevent empty lines from
appearing in the output.
Diffstat (limited to 'doc/guide')
-rw-r--r--doc/guide/files/fixes.xml42
-rw-r--r--doc/guide/files/infr.design.xml6
-rw-r--r--doc/guide/files/platforms.xml6
3 files changed, 27 insertions, 27 deletions
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 66d1a33a130..1a341559628 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.140 2016/07/09 16:07:35 rillig Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.141 2016/07/09 16:19:15 rillig Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -325,9 +325,9 @@ ACCEPTABLE_LICENSES+=xv-license
libraries to build and run, and if that package has a
<filename>buildlink3.mk</filename> file available, use it:</para>
- <programlisting>
+<programlisting>
.include "../../graphics/jpeg/buildlink3.mk"
- </programlisting>
+</programlisting>
</listitem>
<listitem>
@@ -335,9 +335,9 @@ ACCEPTABLE_LICENSES+=xv-license
libraries only for building, and if that package has a
<filename>buildlink3.mk</filename> file available, use it:</para>
- <programlisting>
+<programlisting>
.include "../../graphics/jpeg/buildlink3.mk"
- </programlisting>
+</programlisting>
<para>but set
<varname>BUILDLINK_DEPMETHOD.<replaceable>jpeg</replaceable>?=build</varname>
to make it a build dependency only. This case is rather
@@ -348,9 +348,9 @@ ACCEPTABLE_LICENSES+=xv-license
<para>If your package needs binaries from another package to build,
use the <varname>BUILD_DEPENDS</varname> definition:</para>
- <programlisting>
+<programlisting>
BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
- </programlisting>
+</programlisting>
</listitem>
<listitem>
@@ -370,9 +370,9 @@ BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
be able to execute the latex binary from the teTeX package
when it runs, and that is specified:</para>
- <programlisting>
+<programlisting>
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
- </programlisting>
+</programlisting>
</listitem>
<listitem>
<para>You can use wildcards in package dependencies. Note that
@@ -390,9 +390,9 @@ DEPENDS+= teTeX-[0-9]*:../../print/teTeX
will only build against a certain minimum version of a
pre-requisite:</para>
- <programlisting>
+<programlisting>
DEPENDS+= ImageMagick>=6.0:../../graphics/ImageMagick
- </programlisting>
+</programlisting>
<para>This means that the package will build using version 6.0
of ImageMagick or newer. Such a dependency may be warranted
@@ -816,13 +816,13 @@ EXTRACT_SUFX= .zip
<quote>ar</quote>, <quote>ranlib</quote>, and <quote>ld
-Bshareable</quote> commands, and instead use:</para>
- <programlisting>
+<programlisting>
${LIBTOOL} --mode=link \
${CC} -o ${.TARGET:.a=.la} \
${OBJS:.o=.lo} \
-rpath ${PREFIX}/lib \
-version-info major:minor
- </programlisting>
+</programlisting>
<para>Note that the library is changed to have a
<filename>.la</filename> extension, and the objects are
@@ -838,7 +838,7 @@ ${LIBTOOL} --mode=link \
<para>From the libtool manual:</para>
- <programlisting>
+<programlisting>
So, libtool library versions are described by three integers:
CURRENT
@@ -855,7 +855,7 @@ AGE' to `CURRENT'.
If two libraries have identical CURRENT and AGE numbers, then the
dynamic linker chooses the library with the greater REVISION number.
- </programlisting>
+</programlisting>
<para>The <quote>-release</quote> option will produce
different results for a.out and ELF (excluding symlinks)
@@ -896,15 +896,15 @@ dynamic linker chooses the library with the greater REVISION number.
expects you to change that argument to be the
<filename>.la</filename> file. e.g.</para>
- <programlisting>
+<programlisting>
${LIBTOOL} --mode=link ${CC} -o someprog -L../somelib -lsomelib
- </programlisting>
+</programlisting>
<para>should be changed to:</para>
- <programlisting>
+<programlisting>
${LIBTOOL} --mode=link ${CC} -o <replaceable>someprog</replaceable> <replaceable>../somelib/somelib.la</replaceable>
- </programlisting>
+</programlisting>
<para>and it will do the right thing with the libraries.</para>
</listitem>
@@ -915,9 +915,9 @@ ${LIBTOOL} --mode=link ${CC} -o <replaceable>someprog</replaceable> <replaceable
--mode=install</quote>, and change the library name to
<filename>.la</filename>. e.g.</para>
- <programlisting>
+<programlisting>
${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${SOMELIB:.a=.la} ${PREFIX}/lib
- </programlisting>
+</programlisting>
<para>This will install the static <filename>.a</filename>,
shared library, any needed symlinks, and run
diff --git a/doc/guide/files/infr.design.xml b/doc/guide/files/infr.design.xml
index d0ba3cdd564..0fce884dbb9 100644
--- a/doc/guide/files/infr.design.xml
+++ b/doc/guide/files/infr.design.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: infr.design.xml,v 1.9 2016/06/10 21:21:42 rillig Exp $ -->
+<!-- $NetBSD: infr.design.xml,v 1.10 2016/07/09 16:19:15 rillig Exp $ -->
<chapter id="infr.design"> <?dbhtml filename="infr.design.html"?>
<title>Design of the pkgsrc infrastructure</title>
@@ -111,7 +111,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} additional-files.tar.gz
<varname>CONFIGURE_ARGS</varname>. To make the effect more
clear, here is an example:</para>
- <programlisting>
+<programlisting>
CONFIGURE_ARGS= # none
CFLAGS= -O
CONFIGURE_ARGS+= CFLAGS=${CFLAGS:Q}
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+= CFLAGS=${CFLAGS:Q}
CONFIGURE_ARGS:= ${CONFIGURE_ARGS}
CFLAGS+= -Wall
- </programlisting>
+</programlisting>
<para>This code shows how the use of the <literal>:=</literal>
operator can quickly lead to unexpected results. The first
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index 113f189e3ef..5f0627e434f 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.97 2016/07/03 19:25:16 sevan Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.98 2016/07/09 16:19:15 rillig Exp $ -->
<chapter id="platforms">
<title>Using pkgsrc on systems other than &os;</title>
@@ -191,9 +191,9 @@
don't have a termcap/terminfo entry for it, but the following .termcap
entry provides adequate emulation in most cases:</para>
- <programlisting>
+<programlisting>
interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
- </programlisting>
+</programlisting>
</sect3>
<sect3 id="platform.interix-limits">