pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc/guide/files Applied the "detab" tab->space convers...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b10223322269
branches: trunk
changeset: 493787:b10223322269
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat May 14 22:34:59 2005 +0000
description:
Applied the "detab" tab->space conversion.
diffstat:
doc/guide/files/binary.xml | 6 +-
doc/guide/files/build.xml | 18 +++++-----
doc/guide/files/buildlink.xml | 46 +++++++++++++-------------
doc/guide/files/components.xml | 4 +-
doc/guide/files/examples.xml | 18 +++++-----
doc/guide/files/faq.xml | 14 ++++----
doc/guide/files/fixes.xml | 4 +-
doc/guide/files/ftp-layout.xml | 10 ++--
doc/guide/files/makefile.xml | 72 +++++++++++++++++++++---------------------
doc/guide/files/options.xml | 36 ++++++++++----------
doc/guide/files/platforms.xml | 18 +++++-----
11 files changed, 123 insertions(+), 123 deletions(-)
diffs (truncated from 585 to 300 lines):
diff -r eb494311b37b -r b10223322269 doc/guide/files/binary.xml
--- a/doc/guide/files/binary.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/binary.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.11 2005/05/08 13:52:17 wiz Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.12 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="binary">
<title>Creating binary packages</title>
@@ -71,7 +71,7 @@
As used in this example, <varname>_ACCEPTABLE=yes</varname>
accepts <emphasis>all</emphasis> licenses.</para>
- <programlisting>PACKAGES?= ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
+ <programlisting>PACKAGES?= ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
WRKOBJDIR?= /usr/tmp/pkgsrc # build here instead of in pkgsrc
BSDSRCDIR= /usr/src
BSDXSRCDIR= /usr/xsrc # for x11/xservers
@@ -131,7 +131,7 @@
starting it from <filename>rc.local</filename>:</para>
<programlisting>( cd /usr/pkgsrc/security/ssh ; make bulk-install )
-if [ -f /usr/pkg/etc/rc.d/sshd ]; then
+if [ -f /usr/pkg/etc/rc.d/sshd ]; then
/usr/pkg/etc/rc.d/sshd
fi</programlisting>
diff -r eb494311b37b -r b10223322269 doc/guide/files/build.xml
--- a/doc/guide/files/build.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/build.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.4 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: build.xml,v 1.5 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="build">
<title>The build process</title>
@@ -103,15 +103,15 @@
<para>The following lines are taken from
<filename>pkgsrc/wm/scwm/Makefile</filename>:</para>
- <programlisting>EVAL_PREFIX+= GTKDIR=gtk+
-CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \
- --with-gtk-prefix="${GTKDIR}" \
- --enable-multibyte</programlisting>
+ <programlisting>EVAL_PREFIX+= GTKDIR=gtk+
+CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \
+ --with-gtk-prefix="${GTKDIR}" \
+ --enable-multibyte</programlisting>
<para>Specific defaults can be defined for the packages evaluated using
<varname>EVAL_PREFIX</varname>, by using a definition of the form:</para>
- <programlisting>GTKDIR_DEFAULT= ${LOCALBASE}</programlisting>
+ <programlisting>GTKDIR_DEFAULT= ${LOCALBASE}</programlisting>
<para>where <varname>GTKDIR</varname> corresponds
to the first definition in
@@ -145,7 +145,7 @@
are not present, an attempt will be made to fetch them using commands
of the form:</para>
- <programlisting>${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}</programlisting>
+ <programlisting>${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}</programlisting>
<para>where ${site} varies through several possibilities in turn: first,
<varname>MASTER_SITE_OVERRIDE</varname> is tried, then the sites
@@ -207,7 +207,7 @@
for a program that comes with a compressed shell archive
whose name ends in <filename>.msg.gz</filename>:</para>
- <programlisting> EXTRACT_SUFX= .msg.gz
+ <programlisting> EXTRACT_SUFX= .msg.gz
EXTRACT_CMD= zcat
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= |sh</programlisting>
@@ -260,7 +260,7 @@
default <quote>configure</quote>. Here's an example from
the <pkg>sysutils/top</pkg> package:</para>
- <programlisting>HAS_CONFIGURE= yes
+ <programlisting>HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
CONFIGURE_ARGS+= netbsd13</programlisting>
diff -r eb494311b37b -r b10223322269 doc/guide/files/buildlink.xml
--- a/doc/guide/files/buildlink.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/buildlink.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.2 2005/04/12 16:13:27 tv Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="buildlink">
<title>Buildlink methodology</title>
@@ -69,7 +69,7 @@
<para> If a dependency on a particular package is required for its libraries and
headers, then we replace: </para>
- <programlisting>DEPENDS+= foo>=1.1.0:../../category/foo</programlisting>
+ <programlisting>DEPENDS+= foo>=1.1.0:../../category/foo</programlisting>
<para>with</para>
@@ -168,25 +168,25 @@
<programlisting>
# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= tiff
+BUILDLINK_DEPENDS+= tiff
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff}
-BUILDLINK_PACKAGES+= tiff
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff}
+BUILDLINK_PACKAGES+= tiff
.if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
-BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
-.endif # TIFF_BUILDLINK3_MK
+BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
+BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
+.endif # TIFF_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} </programlisting>
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} </programlisting>
<para> The header and footer manipulate
<varname>BUILDLINK_DEPTH</varname>, which is common across all
@@ -441,33 +441,33 @@
# IS_BUILTIN.foo is set to "yes" or "no" depending on whether "foo"
# genuinely exists in the system or not.
#
-IS_BUILTIN.foo?= no
+IS_BUILTIN.foo?= no
# BUILTIN_PKG.foo should be set here if "foo" is built-in and its package
# version can be determined.
#
. if !empty(IS_BUILTIN.foo:M[yY][eE][sS])
-BUILTIN_PKG.foo?= foo-1.0
+BUILTIN_PKG.foo?= foo-1.0
. endif
.endif # IS_BUILTIN.foo
.if !defined(USE_BUILTIN.foo)
-USE_BUILTIN.foo?= ${IS_BUILTIN.foo}
+USE_BUILTIN.foo?= ${IS_BUILTIN.foo}
. if defined(BUILTIN_PKG.foo)
. for _depend_ in ${BUILDLINK_DEPENDS.foo}
. if !empty(USE_BUILTIN.foo:M[yY][eE][sS])
-USE_BUILTIN.foo!= \
- if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then \
- ${ECHO} "yes"; \
- else \
- ${ECHO} "no"; \
+USE_BUILTIN.foo!= \
+ if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then \
+ ${ECHO} "yes"; \
+ else \
+ ${ECHO} "no"; \
fi
. endif
. endfor
. endif
-.endif # USE_BUILTIN.foo
+.endif # USE_BUILTIN.foo
-CHECK_BUILTIN.foo?= no
+CHECK_BUILTIN.foo?= no
.if !empty(CHECK_BUILTIN.foo:M[nN][oO])
#
# Here we place code that depends on whether USE_BUILTIN.foo is set to
@@ -552,8 +552,8 @@
bits on a NetBSD system, you can set: </para>
<programlisting>
- PREFER_PKGSRC= yes
- PREFER_NATIVE= getopt skey tcp_wrappers
+ PREFER_PKGSRC= yes
+ PREFER_NATIVE= getopt skey tcp_wrappers
</programlisting>
<para> A package <emphasis>must</emphasis> have a
diff -r eb494311b37b -r b10223322269 doc/guide/files/components.xml
--- a/doc/guide/files/components.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/components.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.4 2005/05/07 15:28:40 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.5 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="components"> <?dbhtml filename="components.html"?>
<title>Package components - files, directories and contents</title>
@@ -354,7 +354,7 @@
accordingly, e.g. <pkg>editors/sam</pkg> again, but the quick
answer is: </para>
- <programlisting>WRKSRC= ${WRKDIR}</programlisting>
+ <programlisting>WRKSRC= ${WRKDIR}</programlisting>
<para> Please note that the old <varname>NO_WRKSUBDIR</varname>
has been deprecated and should not be used. Also, if your
diff -r eb494311b37b -r b10223322269 doc/guide/files/examples.xml
--- a/doc/guide/files/examples.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/examples.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: examples.xml,v 1.3 2005/05/10 00:05:03 rillig Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.4 2005/05/14 22:34:59 rillig Exp $ -->
<appendix id="examples">
<title>A simple example package: bison</title>
@@ -18,16 +18,16 @@
<programlisting># $NetBSD$
#
-DISTNAME= bison-1.25
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
+DISTNAME= bison-1.25
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNU}
-MAINTAINER= thorpej%NetBSD.org@localhost
-HOMEPAGE= http://www.gnu.org/software/bison/bison.html
-COMMENT= GNU yacc clone
+MAINTAINER= thorpej%NetBSD.org@localhost
+HOMEPAGE= http://www.gnu.org/software/bison/bison.html
+COMMENT= GNU yacc clone
-GNU_CONFIGURE= yes
-INFO_FILES= bison.info
+GNU_CONFIGURE= yes
+INFO_FILES= bison.info
.include "../../mk/bsd.pkg.mk"</programlisting>
</sect2>
diff -r eb494311b37b -r b10223322269 doc/guide/files/faq.xml
--- a/doc/guide/files/faq.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/faq.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.7 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.8 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="faq"> <?dbhtml filename="faq.html"?>
<title>Frequently Asked Questions</title>
@@ -258,12 +258,12 @@
resume downloads, you'll have to use something like:</para>
<programlisting>
- FETCH_CMD=wget
- .if defined(FETCH_CMD) && ${FETCH_CMD} == "wget"
- FETCH_BEFORE_ARGS=--passive-ftp
- FETCH_RESUME_ARGS=-c
- FETCH_OUTPUT_ARGS=-O
- .endif
+ FETCH_CMD=wget
+ .if defined(FETCH_CMD) && ${FETCH_CMD} == "wget"
+ FETCH_BEFORE_ARGS=--passive-ftp
+ FETCH_RESUME_ARGS=-c
+ FETCH_OUTPUT_ARGS=-O
+ .endif
</programlisting>
</sect1>
diff -r eb494311b37b -r b10223322269 doc/guide/files/fixes.xml
--- a/doc/guide/files/fixes.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/fixes.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.13 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.14 2005/05/14 22:34:59 rillig Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Notes on fixes for packages</title>
@@ -901,7 +901,7 @@
<filename>/etc/mk.conf</filename> to indicate acceptance of
the particular license:</para>
- <programlisting>ACCEPTABLE_LICENSES+=graphviz-license</programlisting>
+ <programlisting>ACCEPTABLE_LICENSES+=graphviz-license</programlisting>
<para>When adding a package with a new license, the license
text should be added to <filename>pkgsrc/licenses</filename>
diff -r eb494311b37b -r b10223322269 doc/guide/files/ftp-layout.xml
--- a/doc/guide/files/ftp-layout.xml Sat May 14 22:33:27 2005 +0000
+++ b/doc/guide/files/ftp-layout.xml Sat May 14 22:34:59 2005 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.2 2005/01/10 21:00:38 hubertf Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
<appendix id="ftp-layout">
<title>Layout of the FTP server's package archive</title>
@@ -64,7 +64,7 @@
Home |
Main Index |
Thread Index |
Old Index