Skip to content

Commit

Permalink
regen
Browse files Browse the repository at this point in the history
  • Loading branch information
jnemeth committed May 6, 2016
1 parent b787b76 commit b298b9b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 32 deletions.
40 changes: 18 additions & 22 deletions doc/pkgsrc.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ <h3 class="corpauthor">
The pkgsrc Developers
</h3>
</div></div>
<div><p class="copyright">Copyright � 1994-2015 The NetBSD Foundation, Inc</p></div>
<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.28 2015/01/01 05:19:02 jnemeth Exp $</p></div>
<div><p class="copyright">Copyright � 1994-2016 The NetBSD Foundation, Inc</p></div>
<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.29 2016/05/06 17:26:34 jnemeth Exp $</p></div>
<div><div class="abstract">
<p class="title"><b>Abstract</b></p>
<p>pkgsrc is a centralized package management system for
Expand Down Expand Up @@ -2257,7 +2257,7 @@ <h3 class="title">Note</h3>
<div class="sect1">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="variables-affecting-installation"></a>5.3.�Variables affecting the installation process</h2></div></div></div>
<p>Most packages support installation into a
<p>Packages have to support installation into a
subdirectory of <code class="varname">WRKDIR</code>. This allows a package
to be built, before the actual filesystem is touched. DESTDIR
support exists in two variations:</p>
Expand All @@ -2268,10 +2268,6 @@ <h3 class="title">Note</h3>
build, installation and packaging as normal user. Root
privileges are only needed to add packages.</p></li>
</ul></div>
<p>DESTDIR support is now the default. To switch back to non-DESTDIR,
you can set
<code class="varname">USE_DESTDIR=no</code>; this setting will be deprecated though,
so it's preferable to convert a package to DESTDIR instead.</p>
<p>With basic DESTDIR support, <strong class="userinput"><code>make
clean</code></strong> needs to be run as root.</p>
<p>Considering the <code class="filename">foo/bar</code> package,
Expand Down Expand Up @@ -7364,7 +7360,7 @@ <h3 class="title">Legacy note</h3>
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="tools.questions"></a>18.4.�Questions regarding the tools</h2></div></div></div>
<div class="qandaset">
<a name="idm76828792"></a><dl>
<a name="idm80579472"></a><dl>
<dt>18.4.1. <a href="#tools.new">How do I add a new tool?</a>
</dt>
<dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
Expand All @@ -7383,7 +7379,7 @@ <h3 class="title">Legacy note</h3>
<tbody>
<tr class="question">
<td align="left" valign="top">
<a name="tools.new"></a><a name="idm76828408"></a><p><b>18.4.1.</b></p>
<a name="tools.new"></a><a name="idm80579088"></a><p><b>18.4.1.</b></p>
</td>
<td align="left" valign="top"><p>How do I add a new tool?</p></td>
</tr>
Expand All @@ -7393,7 +7389,7 @@ <h3 class="title">Legacy note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="tools.listall"></a><a name="idm76827384"></a><p><b>18.4.2.</b></p>
<a name="tools.listall"></a><a name="idm80578064"></a><p><b>18.4.2.</b></p>
</td>
<td align="left" valign="top"><p>How do I get a list of all available
tools?</p></td>
Expand All @@ -7404,7 +7400,7 @@ <h3 class="title">Legacy note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="tools.used"></a><a name="idm76826360"></a><p><b>18.4.3.</b></p>
<a name="tools.used"></a><a name="idm80577040"></a><p><b>18.4.3.</b></p>
</td>
<td align="left" valign="top"><p>How can I get a list of all the tools that a
package is using while being built? I want to know whether it
Expand Down Expand Up @@ -8175,7 +8171,7 @@ <h3 class="title">Note</h3>
</p>
<pre class="programlisting">
DISTNAME= example-1.0
MASTER_SITES= ${MASTER_SITE_GITHUB:example/}
MASTER_SITES= ${MASTER_SITE_GITHUB:=example/}
#GITHUB_PROJECT= # can be omitted if same as DISTNAME
GITHUB_TAG= 988881adc9fc3655077dc2d4d757d480b5ea0e11
</pre>
Expand Down Expand Up @@ -9565,7 +9561,7 @@ <h3 class="title">Note</h3>
and if you still don't have the answer, ask on the
<code class="literal">pkgsrc-users</code> mailing list.</p>
<div class="qandaset">
<a name="idm78353784"></a><dl>
<a name="idm80019600"></a><dl>
<dt>22.1. <a href="#devfaq.makeflags">What is the difference between
MAKEFLAGS, .MAKEFLAGS and
MAKE_FLAGS?</a>
Expand Down Expand Up @@ -9610,7 +9606,7 @@ <h3 class="title">Note</h3>
<tbody>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.makeflags"></a><a name="idm78353400"></a><p><b>22.1.</b></p>
<a name="devfaq.makeflags"></a><a name="idm80019216"></a><p><b>22.1.</b></p>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
Expand All @@ -9626,7 +9622,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.make"></a><a name="idm78349432"></a><p><b>22.2.</b></p>
<a name="devfaq.make"></a><a name="idm80015248"></a><p><b>22.2.</b></p>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
Expand All @@ -9644,7 +9640,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.cc"></a><a name="idm78344952"></a><p><b>22.3.</b></p>
<a name="devfaq.cc"></a><a name="idm80002576"></a><p><b>22.3.</b></p>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
Expand All @@ -9662,7 +9658,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.bl3flags"></a><a name="idm78340856"></a><p><b>22.4.</b></p>
<a name="devfaq.bl3flags"></a><a name="idm79998480"></a><p><b>22.4.</b></p>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">BUILDLINK_LDFLAGS</code>,
Expand All @@ -9675,7 +9671,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.bl3prefix"></a><a name="idm78338552"></a><p><b>22.5.</b></p>
<a name="devfaq.bl3prefix"></a><a name="idm79996176"></a><p><b>22.5.</b></p>
</td>
<td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
Expand All @@ -9691,7 +9687,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.master_sites"></a><a name="idm78335480"></a><p><b>22.6.</b></p>
<a name="devfaq.master_sites"></a><a name="idm79993104"></a><p><b>22.6.</b></p>
</td>
<td align="left" valign="top"><p>What does
<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
Expand All @@ -9715,7 +9711,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.mailinglists"></a><a name="idm78327416"></a><p><b>22.7.</b></p>
<a name="devfaq.mailinglists"></a><a name="idm79985040"></a><p><b>22.7.</b></p>
</td>
<td align="left" valign="top"><p>Which mailing lists are there for package
developers?</p></td>
Expand All @@ -9740,7 +9736,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.documentation"></a><a name="idm78323704"></a><p><b>22.8.</b></p>
<a name="devfaq.documentation"></a><a name="idm79981328"></a><p><b>22.8.</b></p>
</td>
<td align="left" valign="top"><p>Where is the pkgsrc
documentation?</p></td>
Expand Down Expand Up @@ -9788,7 +9784,7 @@ <h3 class="title">Note</h3>
</tr>
<tr class="question">
<td align="left" valign="top">
<a name="devfaq.too-much-time"></a><a name="idm78317176"></a><p><b>22.9.</b></p>
<a name="devfaq.too-much-time"></a><a name="idm79974800"></a><p><b>22.9.</b></p>
</td>
<td align="left" valign="top"><p>I have a little time to kill. What shall I
do?</p></td>
Expand Down
16 changes: 6 additions & 10 deletions doc/pkgsrc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Hubert Feyrer

The pkgsrc Developers

Copyright 1994-2015 The NetBSD Foundation, Inc
Copyright 1994-2016 The NetBSD Foundation, Inc

$NetBSD: pkgsrc.xml,v 1.28 2015/01/01 05:19:02 jnemeth Exp $
$NetBSD: pkgsrc.xml,v 1.29 2016/05/06 17:26:34 jnemeth Exp $

Abstract

Expand Down Expand Up @@ -1948,20 +1948,16 @@ XXX

5.3. Variables affecting the installation process

Most packages support installation into a subdirectory of WRKDIR. This allows a
package to be built, before the actual filesystem is touched. DESTDIR support
exists in two variations:
Packages have to support installation into a subdirectory of WRKDIR. This
allows a package to be built, before the actual filesystem is touched. DESTDIR
support exists in two variations:

* Basic DESTDIR support means that the package installation and packaging is
still run as root.

* Full DESTDIR support can run the complete build, installation and packaging
as normal user. Root privileges are only needed to add packages.

DESTDIR support is now the default. To switch back to non-DESTDIR, you can set
USE_DESTDIR=no; this setting will be deprecated though, so it's preferable to
convert a package to DESTDIR instead.

With basic DESTDIR support, make clean needs to be run as root.

Considering the foo/bar package, DESTDIR full support can be tested using the
Expand Down Expand Up @@ -6855,7 +6851,7 @@ If your distfile URL looks similar to http://github.com/example/example/archive
specific commit not tied to a release.

DISTNAME= example-1.0
MASTER_SITES= ${MASTER_SITE_GITHUB:example/}
MASTER_SITES= ${MASTER_SITE_GITHUB:=example/}
#GITHUB_PROJECT= # can be omitted if same as DISTNAME
GITHUB_TAG= 988881adc9fc3655077dc2d4d757d480b5ea0e11

Expand Down

0 comments on commit b298b9b

Please sign in to comment.