PERFORCE change 203591 for review
Rene Ladan
rene at FreeBSD.org
Tue Dec 27 13:52:00 UTC 2011
http://p4web.freebsd.org/@@203591?ac=10
Change 203591 by rene at rene_acer on 2011/12/27 13:51:41
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#117 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#43 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#120 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#51 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#48 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#42 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#36 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#11 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#117 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1044 2011/12/23 12:17:19 pawel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1045 2011/12/26 20:05:28 pawel Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -424,6 +424,11 @@
</listitem>
<listitem>
+ <para>Alexander Pyhalov
+ <email>alp at sfedu.ru</email></para>
+ </listitem>
+
+ <listitem>
<para>alexander smishlajev
<email>alex at ank-sia.com</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#5 (text+ko) ====
@@ -11,7 +11,7 @@
<firstname>Jason</firstname>
<surname>Helfman</surname>
<affiliation>
- <address><email>jhelfman at experts-exchange.com</email></address>
+ <address>&a.jgh;</address>
</affiliation>
</author>
@@ -22,7 +22,7 @@
<holder role="mailto:jhelfman at experts-exchange.com">Jason Helfman</holder>
</copyright>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml,v 1.5 2011/05/15 20:41:30 uqs Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml,v 1.6 2011/12/24 22:33:28 jgh Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -455,6 +455,18 @@
&prompt.root; <userinput>sh scripts/upload.sh <replaceable>amd64 7.2-RELEASE</replaceable></userinput></screen>
</informalexample>
+ <note>
+ <para>In the event update code needs to be re-uploaded, this may be
+ done by changing to the public distributions directory for the
+ target release and updating attributes of the
+ <emphasis>uploaded</emphasis> file.</para>
+
+ <informalexample>
+ <screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server/pub/<replaceable>7.2-RELEASE/amd64</replaceable></userinput>
+&prompt.root; <userinput>touch -t <replaceable>200801010101.01</replaceable> uploaded</userinput></screen>
+ </informalexample>
+ </note>
+
<!-- If freebsd-update works with other http servers too, we should
avoid making the instructions Apache-specific here. -->
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#43 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>The &os; Ports Management Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.83 2011/12/12 01:54:41 linimon Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.84 2011/12/24 21:22:29 linimon Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -2477,6 +2477,21 @@
<para>This section is in progress.</para>
+ <sect2 id="pointyhat-src">
+ <title>Configuring <literal>src</literal></title>
+
+ <procedure>
+
+ <step>
+ <para>Add the following to <filename>etc/sysctl.conf</filename>:<screen>
+kern.maxfiles=40000</screen>
+ </para>
+ </step>
+
+ </procedure>
+
+ </sect2>
+
<sect2 id="pointyhat-ports">
<title>Configuring <literal>ports</literal></title>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#120 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1135 2011/12/23 07:39:51 dougb Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1136 2011/12/26 04:46:11 wblock Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -119,24 +119,24 @@
<para>The minimal <filename>Makefile</filename> would look something
like this:</para>
- <programlisting># New ports collection makefile for: oneko
+ <programlisting># New ports collection makefile for: oneko
# Date created: 5 December 1994
# Whom: asami
#
# $FreeBSD$
#
-PORTNAME= oneko
-PORTVERSION= 1.1b
-CATEGORIES= games
-MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
+PORTNAME= oneko
+PORTVERSION= 1.1b
+CATEGORIES= games
+MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
-MAINTAINER= asami at FreeBSD.org
-COMMENT= A cat chasing a mouse all over the screen
+MAINTAINER= asami at FreeBSD.org
+COMMENT= A cat chasing a mouse all over the screen
-MAN1= oneko.1
-MANCOMPRESSED= yes
-USE_IMAKE= yes
+MAN1= oneko.1
+MANCOMPRESSED= yes
+USE_IMAKE= yes
.include <bsd.port.mk></programlisting>
@@ -238,12 +238,12 @@
<filename>oneko</filename> port by adding the
following lines to the <filename>Makefile</filename>:</para>
- <programlisting>PLIST_FILES= bin/oneko \
- lib/X11/app-defaults/Oneko \
- lib/X11/oneko/cat1.xpm \
- lib/X11/oneko/cat2.xpm \
- lib/X11/oneko/mouse.xpm
-PLIST_DIRS= lib/X11/oneko</programlisting>
+ <programlisting>PLIST_FILES= bin/oneko \
+ lib/X11/app-defaults/Oneko \
+ lib/X11/oneko/cat1.xpm \
+ lib/X11/oneko/cat2.xpm \
+ lib/X11/oneko/mouse.xpm
+PLIST_DIRS= lib/X11/oneko</programlisting>
<para>Of course, <makevar>PLIST_DIRS</makevar> should be left
unset if a port installs no directories of its own.</para>
@@ -738,7 +738,7 @@
<filename>Makefile</filename>. A list of files to convert can
be specified:</para>
- <programlisting>USE_DOS2UNIX= util.c util.h</programlisting>
+ <programlisting>USE_DOS2UNIX= util.c util.h</programlisting>
<para>If you want to convert a group of files across subdirectories,
<makevar>DOS2UNIX_REGEX</makevar> can be used. Its argument is
@@ -747,8 +747,8 @@
converting all files of a given extension, for example all source
code files leaving binary files intact:</para>
- <programlisting>USE_DOS2UNIX= yes
-DOS2UNIX_REGEX= .*\.(c|cpp|h)</programlisting>
+ <programlisting>USE_DOS2UNIX= yes
+DOS2UNIX_REGEX= .*\.(c|cpp|h)</programlisting>
<para>If you want to create a patch file based off of an
existing file, you can copy it with an
@@ -1010,8 +1010,8 @@
<literal>0.10</literal>, is committed to the ports
collection:</para>
- <programlisting>PORTNAME= gtkmumble
-PORTVERSION= 0.10</programlisting>
+ <programlisting>PORTNAME= gtkmumble
+PORTVERSION= 0.10</programlisting>
<para><makevar>PKGNAME</makevar> becomes
<literal>gtkmumble-0.10</literal>.</para>
@@ -1020,9 +1020,9 @@
FreeBSD patch. <makevar>PORTREVISION</makevar> is bumped
accordingly.</para>
- <programlisting>PORTNAME= gtkmumble
-PORTVERSION= 0.10
-PORTREVISION= 1</programlisting>
+ <programlisting>PORTNAME= gtkmumble
+PORTVERSION= 0.10
+PORTREVISION= 1</programlisting>
<para><makevar>PKGNAME</makevar> becomes
<literal>gtkmumble-0.10_1</literal></para>
@@ -1040,9 +1040,9 @@
<makevar>PORTREVISION</makevar> is reset to 0 (or removed
from the <filename>Makefile</filename>).</para>
- <programlisting>PORTNAME= gtkmumble
-PORTVERSION= 0.2
-PORTEPOCH= 1</programlisting>
+ <programlisting>PORTNAME= gtkmumble
+PORTVERSION= 0.2
+PORTEPOCH= 1</programlisting>
<para><makevar>PKGNAME</makevar> becomes
<literal>gtkmumble-0.2,1</literal></para>
@@ -1051,9 +1051,9 @@
<makevar>PORTEPOCH</makevar> never decreases, the version
variables are now:</para>
- <programlisting>PORTNAME= gtkmumble
-PORTVERSION= 0.3
-PORTEPOCH= 1</programlisting>
+ <programlisting>PORTNAME= gtkmumble
+PORTVERSION= 0.3
+PORTEPOCH= 1</programlisting>
<para><makevar>PKGNAME</makevar> becomes
<literal>gtkmumble-0.3,1</literal></para>
@@ -2325,8 +2325,8 @@
<makevar>MASTER_SITE_SUBDIR</makevar> to the path within the
archive. Here is an example:</para>
- <programlisting>MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= make</programlisting>
+ <programlisting>MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= make</programlisting>
<para>Or you can use a condensed format:</para>
@@ -2454,8 +2454,8 @@
<filename>foo.tgz</filename> instead of the more normal
<filename>foo.tar.gz</filename>, you would write:</para>
- <programlisting>DISTNAME= foo
-EXTRACT_SUFX= .tgz</programlisting>
+ <programlisting>DISTNAME= foo
+EXTRACT_SUFX= .tgz</programlisting>
<para>The <makevar>USE_BZIP2</makevar> and <makevar>USE_ZIP</makevar>
variables automatically set <makevar>EXTRACT_SUFX</makevar> to
@@ -2482,7 +2482,7 @@
space separated list of all the files that must be
downloaded.</para>
- <programlisting>DISTFILES= source1.tar.gz source2.tar.gz</programlisting>
+ <programlisting>DISTFILES= source1.tar.gz source2.tar.gz</programlisting>
<para>If not explicitly set, <makevar>DISTFILES</makevar> defaults to
<literal>${DISTNAME}${EXTRACT_SUFX}</literal>.</para>
@@ -2496,8 +2496,8 @@
another is an uncompressed document—list the filenames that
must be extracted in <makevar>EXTRACT_ONLY</makevar>.</para>
- <programlisting>DISTFILES= source.tar.gz manual.html
-EXTRACT_ONLY= source.tar.gz</programlisting>
+ <programlisting>DISTFILES= source.tar.gz manual.html
+EXTRACT_ONLY= source.tar.gz</programlisting>
<para>If <emphasis>none</emphasis> of the <makevar>DISTFILES</makevar>
should be uncompressed then set <makevar>EXTRACT_ONLY</makevar> to
@@ -2572,7 +2572,7 @@
<literal>[0-9]</literal> and denote a group designation.
For example:</para>
- <programlisting>DISTFILES= alpha:0 beta:1</programlisting>
+ <programlisting>DISTFILES= alpha:0 beta:1</programlisting>
<para>In OpenBSD, distribution file <filename>alpha</filename>
will be associated with variable
@@ -2645,9 +2645,9 @@
<title>Simplified use of <literal>MASTER_SITES:n</literal>
with 1 file per site</title>
- <programlisting>MASTER_SITES= ftp://ftp.example1.com/:source1 \
+ <programlisting>MASTER_SITES= ftp://ftp.example1.com/:source1 \
ftp://ftp.example2.com/:source2
-DISTFILES= source1.tar.gz:source1 \
+DISTFILES= source1.tar.gz:source1 \
source2.tar.gz:source2</programlisting>
</example>
@@ -2665,9 +2665,9 @@
<title>Simplified use of <literal>MASTER_SITES:n</literal>
with more than 1 file per site</title>
- <programlisting>MASTER_SITES= ftp://ftp.example1.com/:source1 \
+ <programlisting>MASTER_SITES= ftp://ftp.example1.com/:source1 \
ftp://ftp.example2.com/:source2
-DISTFILES= source1.tar.gz:source1 \
+DISTFILES= source1.tar.gz:source1 \
source2.tar.gz:source2 \
source3.tar.gz:source2</programlisting>
</example>
@@ -2728,9 +2728,9 @@
<para>The following examples are equivalent but the
first one is preferred:</para>
- <programlisting>MASTER_SITES= alpha
+ <programlisting>MASTER_SITES= alpha</programlisting>
-MASTER_SITES= alpha:DEFAULT</programlisting>
+ <programlisting>MASTER_SITES= alpha:DEFAULT</programlisting>
</listitem>
<listitem>
@@ -2756,13 +2756,13 @@
<para>All the following examples are equivalent but the
last one is preferred:</para>
- <programlisting>MASTER_SITES= alpha alpha:SOME_SITE
+ <programlisting>MASTER_SITES= alpha alpha:SOME_SITE</programlisting>
-MASTER_SITES= alpha:DEFAULT alpha:SOME_SITE
+ <programlisting>MASTER_SITES= alpha:DEFAULT alpha:SOME_SITE</programlisting>
-MASTER_SITES= alpha:SOME_SITE,DEFAULT
+ <programlisting>MASTER_SITES= alpha:SOME_SITE,DEFAULT</programlisting>
-MASTER_SITES= alpha:DEFAULT,SOME_SITE</programlisting>
+ <programlisting>MASTER_SITES= alpha:DEFAULT,SOME_SITE</programlisting>
</listitem>
<listitem>
@@ -2821,7 +2821,7 @@
<literal>MASTER_SITES:n</literal> in
<makevar>MASTER_SITE_SUBDIR</makevar></title>
- <programlisting>MASTER_SITE_SUBDIR= old:n new/:NEW</programlisting>
+ <programlisting>MASTER_SITE_SUBDIR= old:n new/:NEW</programlisting>
<itemizedlist>
<listitem>
@@ -2843,16 +2843,16 @@
operator, multiple files, multiple sites and
multiple subdirectories</title>
- <programlisting>MASTER_SITES= http://site1/%SUBDIR%/ http://site2/:DEFAULT \
+ <programlisting>MASTER_SITES= http://site1/%SUBDIR%/ http://site2/:DEFAULT \
http://site3/:group3 http://site4/:group4 \
http://site5/:group5 http://site6/:group6 \
http://site7/:DEFAULT,group6 \
http://site8/%SUBDIR%/:group6,group7 \
http://site9/:group8
-DISTFILES= file1 file2:DEFAULT file3:group3 \
+DISTFILES= file1 file2:DEFAULT file3:group3 \
file4:group4,group5,group6 file5:grouping \
file6:group7
-MASTER_SITE_SUBDIR= directory-trial:1 directory-n/:groupn \
+MASTER_SITE_SUBDIR= directory-trial:1 directory-n/:groupn \
directory-one/:group6,DEFAULT \
directory</programlisting>
@@ -3041,8 +3041,8 @@
<literal>MASTER_SITES:n</literal> with
<makevar>MASTER_SITE_SOURCEFORGE</makevar></title>
- <programlisting>MASTER_SITES= http://site1/ ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge,TEST/}
-DISTFILES= something.tar.gz:sourceforge</programlisting>
+ <programlisting>MASTER_SITES= http://site1/ ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge,TEST/}
+DISTFILES= something.tar.gz:sourceforge</programlisting>
</example>
<para><filename>something.tar.gz</filename> will be
@@ -3066,8 +3066,8 @@
<literal>MASTER_SITES:n</literal> with
<makevar>PATCH_SITES</makevar>.</title>
- <programlisting>PATCH_SITES= http://site1/ http://site2/:test
-PATCHFILES= patch1:test</programlisting>
+ <programlisting>PATCH_SITES= http://site1/ http://site2/:test
+PATCHFILES= patch1:test</programlisting>
</example>
</listitem>
</orderedlist>
@@ -3240,8 +3240,8 @@
id="ports-master-sites-n-example-always-keep-distfiles">
<title>Use of <makevar>ALWAYS_KEEP_DISTFILES</makevar>.</title>
<programlisting>.if defined(PACKAGE_BUILDING)
-DISTFILES+= <replaceable>foo.tar.gz</replaceable>
-ALWAYS_KEEP_DISTFILES= yes
+DISTFILES+= <replaceable>foo.tar.gz</replaceable>
+ALWAYS_KEEP_DISTFILES= yes
.endif</programlisting>
</example>
@@ -3309,7 +3309,7 @@
should begin with a capital and end without a period. Here
is an example:</para>
- <programlisting>COMMENT= A cat chasing a mouse all over the screen</programlisting>
+ <programlisting>COMMENT= A cat chasing a mouse all over the screen</programlisting>
<para>The COMMENT variable should immediately follow the MAINTAINER
variable in the <filename>Makefile</filename>.</para>
@@ -3342,9 +3342,11 @@
shared library, <replaceable>dir</replaceable> is the
directory in which to find it in case it is not available, and
<replaceable>target</replaceable> is the target to call in that
- directory. For example,
- <programlisting>LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
- will check for a shared jpeg library with major version 9, and
+ directory. For example,</para>
+
+ <programlisting>LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+
+ <para>will check for a shared jpeg library with major version 9, and
descend into the <filename>graphics/jpeg</filename> subdirectory
of your ports tree to build and install it if it is not found.
The <replaceable>target</replaceable> part can be omitted if it is
@@ -3390,8 +3392,8 @@
<para>For example,</para>
- <programlisting>RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
- xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
+ <programlisting>RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+ xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
<para>will check if the file or directory
<filename>/usr/local/etc/innd</filename> exists, and build and
@@ -3432,7 +3434,7 @@
case, it is both tempting and intuitive to directly
assign one to the other:</para>
- <programlisting>RUN_DEPENDS= ${BUILD_DEPENDS}</programlisting>
+ <programlisting>RUN_DEPENDS= ${BUILD_DEPENDS}</programlisting>
<para>However, such assignment can pollute run-time dependencies
with entries not defined in the port's original <makevar>BUILD_DEPENDS</makevar>.
@@ -3447,7 +3449,7 @@
with expansion, i.e. expand the value before assigning it to the
variable:</para>
- <programlisting>RUN_DEPENDS:= ${BUILD_DEPENDS}</programlisting>
+ <programlisting>RUN_DEPENDS:= ${BUILD_DEPENDS}</programlisting>
</sect2>
<sect2>
@@ -3457,8 +3459,11 @@
requires to build. Like <makevar>RUN_DEPENDS</makevar>, it is a
list of
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
- tuples. For example, <programlisting> BUILD_DEPENDS=
- unzip:${PORTSDIR}/archivers/unzip</programlisting> will check
+ tuples. For example,</para>
+
+ <programlisting>BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip</programlisting>
+
+ <para>will check
for an executable called <command>unzip</command>, and descend
into the <filename>archivers/unzip</filename> subdirectory of your
ports tree to build and install it if it is not found.</para>
@@ -3478,8 +3483,11 @@
<para>This variable specifies executables or files this port
requires to fetch. Like the previous two, it is a list of
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
- tuples. For example, <programlisting> FETCH_DEPENDS=
- ncftp2:${PORTSDIR}/net/ncftp2</programlisting> will check for an
+ tuples. For example,</para>
+
+ <programlisting>FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2</programlisting>
+
+ <para>will check for an
executable called <command>ncftp2</command>, and descend into the
<filename>net/ncftp2</filename> subdirectory of your ports tree to
build and install it if it is not found.</para>
@@ -3496,8 +3504,11 @@
<para>This variable specifies executables or files this port
requires for extraction. Like the previous, it is a list of
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
- tuples. For example, <programlisting>EXTRACT_DEPENDS=
- unzip:${PORTSDIR}/archivers/unzip</programlisting> will check
+ tuples. For example,</para>
+
+ <programlisting>EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip</programlisting>
+
+ <para>will check
for an executable called <command>unzip</command>, and descend
into the <filename>archivers/unzip</filename> subdirectory of
your ports tree to build and install it if it is not found.</para>
@@ -3522,9 +3533,11 @@
<para>This variable specifies executables or files this port
requires to patch. Like the previous, it is a list of
<replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
- tuples. For example, <programlisting> PATCH_DEPENDS=
- ${NONEXISTENT}:${PORTSDIR}/java/jfc:extract
- </programlisting>will descend into the
+ tuples. For example,</para>
+
+ <programlisting>PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/java/jfc:extract</programlisting>
+
+ <para>will descend into the
<filename>java/jfc</filename> subdirectory of your ports tree to
extract it.</para>
@@ -3554,8 +3567,11 @@
<para>It is <emphasis>always</emphasis> incorrect to set
any <makevar>USE_<replaceable>*</replaceable></makevar>
in <filename>/etc/make.conf</filename>. For instance,
- setting <programlisting>USE_GCC=3.4</programlisting>
- would add a dependency on gcc34 for every port,
+ setting</para>
+
+ <programlisting>USE_GCC= 3.4</programlisting>
+
+ <para>would add a dependency on gcc34 for every port,
including gcc34 itself!</para>
</note>
@@ -3688,11 +3704,11 @@
<makevar>RUN_DEPENDS</makevar>. Use this only when you need to
get the source of the other port. You can often save
compilation time by specifying the target too. For
- instance
+ instance</para>
- <programlisting>BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract</programlisting>
+ <programlisting>BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract</programlisting>
- will always descend to the <literal>jpeg</literal> port and extract it.</para>
+ <para>will always descend to the <literal>jpeg</literal> port and extract it.</para>
</sect2>
<sect2>
@@ -3735,18 +3751,18 @@
<para>This will be best demonstrated by an example. This is part of
<filename>japanese/xdvi300/Makefile</filename>;</para>
- <programlisting>PORTNAME= xdvi
-PORTVERSION= 17
-PKGNAMEPREFIX= ja-
-PKGNAMESUFFIX= ${RESOLUTION}
+ <programlisting>PORTNAME= xdvi
+PORTVERSION= 17
+PKGNAMEPREFIX= ja-
+PKGNAMESUFFIX= ${RESOLUTION}
:
# default
-RESOLUTION?= 300
+RESOLUTION?= 300
.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
- @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
- @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
- @${FALSE}
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+ @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
+ @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
+ @${FALSE}
.endif</programlisting>
<para><filename role="package">japanese/xdvi300</filename> also has all the regular
@@ -3757,8 +3773,8 @@
<para>As for other resolutions, this is the <emphasis>entire</emphasis>
<filename>xdvi118/Makefile</filename>:</para>
- <programlisting>RESOLUTION= 118
-MASTERDIR= ${.CURDIR}/../xdvi300
+ <programlisting>RESOLUTION= 118
+MASTERDIR= ${.CURDIR}/../xdvi300
.include "${MASTERDIR}/Makefile"</programlisting>
@@ -3826,13 +3842,13 @@
<para>Here is an example that puts it all together.</para>
- <programlisting>MAN1= foo.1
-MAN3= bar.3
-MAN4= baz.4
-MLINKS= foo.1 alt-name.8
-MANLANG= "" ja
-MAN3PREFIX= ${PREFIX}/share/foobar
-MANCOMPRESSED= yes</programlisting>
+ <programlisting>MAN1= foo.1
+MAN3= bar.3
+MAN4= baz.4
+MLINKS= foo.1 alt-name.8
+MANLANG= "" ja
+MAN3PREFIX= ${PREFIX}/share/foobar
+MANCOMPRESSED= yes</programlisting>
<para>This states that six files are installed by this port;</para>
@@ -3851,10 +3867,10 @@
<para>If only some manpages are translated, you can use several variables
dynamically created from <makevar>MANLANG</makevar> content:</para>
- <programlisting>MANLANG= "" de ja
-MAN1= foo.1
-MAN1_EN= bar.1
-MAN3_DE= baz.3</programlisting>
+ <programlisting>MANLANG= "" de ja
+MAN1= foo.1
+MAN1_EN= bar.1
+MAN3_DE= baz.3</programlisting>
<para>This translates into this list of files:</para>
@@ -3880,10 +3896,11 @@
For example, <filename role="package">lang/gcc34</filename> installs
info files to
<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar>/gcc34</filename>,
- and <makevar>INFO</makevar> will be something like this:
- <programlisting>INFO= gcc34/cpp gcc34/cppinternals gcc34/g77 ...
-</programlisting>
- Appropriate installation/de-installation code will be automatically
+ and <makevar>INFO</makevar> will be something like this:</para>
+
+ <programlisting>INFO= gcc34/cpp gcc34/cppinternals gcc34/g77 ...</programlisting>
+
+ <para>Appropriate installation/de-installation code will be automatically
added to the temporary <filename>pkg-plist</filename> before package
registration.</para>
</sect1>
@@ -4038,12 +4055,11 @@
<sect3>
<title>Syntax</title>
- <para>The syntax for the <makevar>OPTIONS</makevar> variable is:
+ <para>The syntax for the <makevar>OPTIONS</makevar> variable is:</para>
-<programlisting>OPTIONS= OPTION "descriptive text" default ...
-</programlisting>
+ <programlisting>OPTIONS= OPTION "descriptive text" default ...</programlisting>
- The value for default is either <literal>ON</literal> or
+ <para>The value for default is either <literal>ON</literal> or
<literal>OFF</literal>. Multiple repetitions of these three fields
are allowed.</para>
@@ -4061,8 +4077,8 @@
<example id="ports-options-simple-use">
<title>Simple use of <makevar>OPTIONS</makevar></title>
- <para><programlisting>OPTIONS= FOO "Enable option foo" On \
- BAR "Support feature bar" Off
+ <programlisting>OPTIONS= FOO "Enable option foo" On \
+ BAR "Support feature bar" Off
.include <bsd.port.options.mk>
@@ -4076,12 +4092,12 @@
RUN_DEPENDS+= bar:${PORTSDIR}/bar/bar
.endif
-.include <bsd.port.mk></programlisting></para>
+.include <bsd.port.mk></programlisting>
</example>
<example id="ports-options-old-style-use">
<title>Old style use of <makevar>OPTIONS</makevar></title>
- <para><programlisting>OPTIONS= FOO "Enable option foo" On
+ <programlisting>OPTIONS= FOO "Enable option foo" On
.include <bsd.port.pre.mk>
@@ -4091,7 +4107,7 @@
CONFIGURE_ARGS+= --with-foo
.endif
-.include <bsd.port.post.mk></programlisting></para>
+.include <bsd.port.post.mk></programlisting>
</example>
</sect3>
</sect2>
@@ -4148,8 +4164,8 @@
<literal>${DISTNAME}</literal>. In other words, if you have
set:</para>
- <programlisting>PORTNAME= foo
-PORTVERSION= 1.0</programlisting>
+ <programlisting>PORTNAME= foo
+PORTVERSION= 1.0</programlisting>
<para>then the port's distribution files contain a top-level directory,
<filename>foo-1.0</filename>, and the rest of the files are located
@@ -4166,11 +4182,11 @@
extracted into a directory called <filename>foo</filename> (and not
<filename>foo-1.0</filename>) you would write:</para>
- <programlisting>WRKSRC= ${WRKDIR}/foo</programlisting>
+ <programlisting>WRKSRC= ${WRKDIR}/foo</programlisting>
<para>or possibly</para>
- <programlisting>WRKSRC= ${WRKDIR}/${PORTNAME}</programlisting>
+ <programlisting>WRKSRC= ${WRKDIR}/${PORTNAME}</programlisting>
</sect2>
<sect2>
@@ -4180,7 +4196,7 @@
you should set <makevar>NO_WRKSUBDIR</makevar> to indicate
that.</para>
- <programlisting>NO_WRKSUBDIR= yes</programlisting>
+ <programlisting>NO_WRKSUBDIR= yes</programlisting>
</sect2>
</sect1>
@@ -4483,7 +4499,7 @@
A typical example of utilizing <makevar>PORTDOCS</makevar>
looks as follows:</para>
- <programlisting>PORTDOCS= README.* ChangeLog docs/*</programlisting>
+ <programlisting>PORTDOCS= README.* ChangeLog docs/*</programlisting>
<note>
<para>The equivalents of <makevar>PORTDOCS</makevar> for files
@@ -4552,7 +4568,7 @@
de-installation will not cause the system to still believe the
library is there.</para>
- <programlisting>USE_LDCONFIG= yes</programlisting>
+ <programlisting>USE_LDCONFIG= yes</programlisting>
<para>If you need, you can override the default directory
by setting the <makevar>USE_LDCONFIG</makevar>
@@ -4564,7 +4580,7 @@
you could use the following in your
<filename>Makefile</filename>:</para>
- <programlisting>USE_LDCONFIG= ${PREFIX}/lib/foo ${PREFIX}/lib/bar</programlisting>
+ <programlisting>USE_LDCONFIG= ${PREFIX}/lib/foo ${PREFIX}/lib/bar</programlisting>
<para>Please
double-check, often this is not necessary at all or can be avoided
@@ -4703,10 +4719,11 @@
<title>Examples</title>
<para>The preferred way to state "the distfiles for this port must be
- fetched manually" is as follows:<programlisting>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= may not be redistributed because of licensing reasons. Please visit <replaceable>some-website</replaceable> to accept their license and download ${DISTFILES} into ${DISTDIR}
-.endif</programlisting></para>
+ fetched manually" is as follows:</para>
+
+ <programlisting>.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE= may not be redistributed because of licensing reasons. Please visit <replaceable>some-website</replaceable> to accept their license and download ${DISTFILES} into ${DISTDIR}
+.endif</programlisting>
<para>This both informs the user, and sets the proper metadata on
the user's machine for use by automated programs.</para>
@@ -4946,7 +4963,7 @@
an individual port can make use of these tools via a simple
construct:</para>
- <programlisting>USE_AUTOTOOLS= <replaceable>tool</replaceable>:<replaceable>version</replaceable>[:<replaceable>operation</replaceable>] ...</programlisting>
+ <programlisting>USE_AUTOTOOLS= <replaceable>tool</replaceable>:<replaceable>version</replaceable>[:<replaceable>operation</replaceable>] ...</programlisting>
<para>At the time of writing, <replaceable>tool</replaceable> can be
one of <literal>libtool</literal>, <literal>libltdl</literal>,
@@ -4984,7 +5001,7 @@
you need to use external <command>libtool</command>, you can use
the version provided by The Ports Collection:</para>
- <programlisting>USE_AUTOTOOLS= libtool:<replaceable>version</replaceable>[:env]</programlisting>
+ <programlisting>USE_AUTOTOOLS= libtool:<replaceable>version</replaceable>[:env]</programlisting>
<para>With no additional operations,
<literal>libtool:<replaceable>version</replaceable></literal> tells
@@ -5016,7 +5033,7 @@
<command>libtool</command> itself, so a separate construct is
provided.</para>
- <programlisting>USE_AUTOTOOLS= libltdl:<replaceable>version</replaceable></programlisting>
+ <programlisting>USE_AUTOTOOLS= libltdl:<replaceable>version</replaceable></programlisting>
<para>Currently, all this does is to bring in a
<makevar>LIB_DEPENDS</makevar> on the appropriate
@@ -5136,21 +5153,21 @@
<envar>CPPFLAGS</envar> and <envar>LDFLAGS</envar> as
follows:</para>
- <programlisting>USE_GETTEXT= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+ <programlisting>USE_GETTEXT= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"</programlisting>
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"</programlisting>
<para>Of course, the code can be more compact if there are no
more flags to pass to <command>configure</command>:</para>
- <programlisting>USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"</programlisting>
+ <programlisting>USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"</programlisting>
</sect2>
<sect2>
@@ -5165,14 +5182,14 @@
For ports of low to medium complexity, you can rely on the
following idiom:</para>
- <programlisting>GNU_CONFIGURE= yes
+ <programlisting>GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif</programlisting>
<para>The next item on your to-do list is to arrange so that
@@ -5392,8 +5409,8 @@
<example id="use-xorg-example">
<title>USE_XORG example</title>
- <programlisting>USE_XORG= xrender xft xkbfile xt xaw
-USE_GL= glu</programlisting>
+ <programlisting>USE_XORG= xrender xft xkbfile xt xaw
+USE_GL= glu</programlisting>
</example>
<para>Many ports define <makevar>USE_XLIB</makevar>, which makes
@@ -5548,10 +5565,10 @@
<title>Using X11 related variables in port</title>
<programlisting># Use some X11 libraries and depend on
# font server as well as cyrillic fonts.
-RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
- ${LOCALBASE}/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_XORG= x11 xpm</programlisting>
+USE_XORG= x11 xpm</programlisting>
</example>
</sect2>
@@ -5618,7 +5635,7 @@
X server. The working <envar>DISPLAY</envar> is then passed
to the build.</para>
- <programlisting>USE_DISPLAY= yes</programlisting>
+ <programlisting>USE_DISPLAY= yes</programlisting>
</sect2>
@@ -5634,7 +5651,7 @@
be created, installed, and added to the
<filename>pkg-plist</filename> automatically. Syntax is:</para>
- <programlisting>DESKTOP_ENTRIES= "NAME" "COMMENT" "ICON" "COMMAND" "CATEGORY" StartupNotify</programlisting>
+ <programlisting>DESKTOP_ENTRIES= "NAME" "COMMENT" "ICON" "COMMAND" "CATEGORY" StartupNotify</programlisting>
<para>The list of possible categories is available on the <ulink
url="http://standards.freedesktop.org/menu-spec/latest/apa.html">Freedesktop
@@ -5644,10 +5661,10 @@
<para>Example:</para>
- <programlisting>DESKTOP_ENTRIES= "ToME" "Roguelike game based on JRR Tolkien's work" \
- "${DATADIR}/xtra/graf/tome-128.png" \
- "tome -v -g" "Application;Game;RolePlaying;" \
- false</programlisting>
+ <programlisting>DESKTOP_ENTRIES= "ToME" "Roguelike game based on JRR Tolkien's work" \
+ "${DATADIR}/xtra/graf/tome-128.png" \
+ "tome -v -g" "Application;Game;RolePlaying;" \
+ false</programlisting>
</sect2>
@@ -5776,18 +5793,18 @@
<para>When <makevar>USE_QT_VER</makevar> is set, some useful
settings are passed to <command>configure</command> script:</para>
- <programlisting>CONFIGURE_ARGS+= --with-qt-includes=${QT_PREFIX}/include \
- --with-qt-libraries=${QT_PREFIX}/lib \
- --with-extra-libs=${LOCALBASE}/lib \
- --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
- QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting>
+ <programlisting>CONFIGURE_ARGS+= --with-qt-includes=${QT_PREFIX}/include \
+ --with-qt-libraries=${QT_PREFIX}/lib \
+ --with-extra-libs=${LOCALBASE}/lib \
+ --with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+ QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting>
<para>If <makevar>USE_QT_VER</makevar> is set to <literal>4</literal>,
the following settings are also deployed:</para>
- <programlisting>CONFIGURE_ENV+= UIC="${UIC}" QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}"
-MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"</programlisting>
+ <programlisting>CONFIGURE_ENV+= UIC="${UIC}" QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}"
+MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"</programlisting>
</sect2>
@@ -5956,8 +5973,8 @@
qmake are only needed at buildtime, thus they are specified
with the <literal>_build</literal> suffix:</para>
- <programlisting>USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
+ <programlisting>USE_QT_VER= 4
+QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
</example>
</sect2>
@@ -5971,8 +5988,8 @@
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
from the provided <filename>BUILD.sh</filename> script. Passing
@@ -6151,10 +6168,10 @@
If port requires some of Qt4 components, <makevar>USE_QT_VER</makevar> should be set
and then needed components can be specified.</para>
- <programlisting>USE_CMAKE= yes
-USE_KDE4= automoc4 kdelibs kdeprefix
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting>
+ <programlisting>USE_CMAKE= yes
+USE_KDE4= automoc4 kdelibs kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting>
</example>
</sect2>
@@ -6459,7 +6476,7 @@
statement (where <filename>myport.jar</filename> is the name
of the JAR file installed as part of the port):</para>
- <programlisting>PLIST_FILES+= %%JAVAJARDIR%%/myport.jar</programlisting>
+ <programlisting>PLIST_FILES+= %%JAVAJARDIR%%/myport.jar</programlisting>
<para>When porting a Java application, the port usually installs
everything under a single directory (including its JAR
@@ -6802,26 +6819,26 @@
<example id="pear-makefile">
<title>Example Makefile for PEAR class</title>
- <programlisting>PORTNAME= Date
-PORTVERSION= 1.4.3
-CATEGORIES= devel www pear
+ <programlisting>PORTNAME= Date
+PORTVERSION= 1.4.3
+CATEGORIES= devel www pear
-MAINTAINER= example at domain.com
-COMMENT= PEAR Date and Time Zone Classes
+MAINTAINER= example at domain.com
+COMMENT= PEAR Date and Time Zone Classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list