diff options
author | wiz <wiz@pkgsrc.org> | 2017-09-26 10:31:32 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-09-26 10:31:32 +0000 |
commit | 5ee35bf41a99e36943b0e7861ec6f0d360cc6a05 (patch) | |
tree | 0b3fc88a5878c6ef13de586c49424d912043d115 /doc | |
parent | 7474fb8d81a0513e3d7e96daa1d15fece6af8e49 (diff) | |
download | pkgsrc-5ee35bf41a99e36943b0e7861ec6f0d360cc6a05.tar.gz |
regen
Diffstat (limited to 'doc')
-rw-r--r-- | doc/pkgsrc.html | 42 | ||||
-rw-r--r-- | doc/pkgsrc.txt | 20 |
2 files changed, 20 insertions, 42 deletions
diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index 87f356b955b..0279b3ddfa7 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -160,8 +160,7 @@ builds)</a></span></dt> <dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt> <dd><dl> <dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt> -<dt><span class="sect2"><a href="#creating.kde-app">10.1.2. KDE3 & KDE4 applications</a></span></dt> -<dt><span class="sect2"><a href="#creating.python-module">10.1.3. Python modules and programs</a></span></dt> +<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt> </dl></dd> <dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt> <dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd> @@ -1231,7 +1230,6 @@ and you can still use binary packages from someone else.</p> easy:</p> <pre class="screen"> <code class="prompt">#</code> <strong class="userinput"><code>pkg_add libreoffice</code></strong> -<code class="prompt">#</code> <strong class="userinput"><code>pkg_add kde-3.5.7</code></strong> <code class="prompt">#</code> <strong class="userinput"><code>pkg_add ap24-php71-*</code></strong> </pre> <p>Note that any prerequisite packages needed to run the @@ -1431,7 +1429,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00 and adding the definitions there.</p> <p> If a package depends on many other packages (such as - <a href="http://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/kde3/README.html" target="_top"><code class="filename">meta-pkgs/kde3</code></a>), the build process may + <a href="http://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/kde4/README.html" target="_top"><code class="filename">meta-pkgs/kde4</code></a>), the build process may alternate between periods of downloading source, and compiling. To ensure you have all the source downloaded initially you can run the command: @@ -2770,8 +2768,7 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u <dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt> <dd><dl> <dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt> -<dt><span class="sect2"><a href="#creating.kde-app">10.1.2. KDE3 & KDE4 applications</a></span></dt> -<dt><span class="sect2"><a href="#creating.python-module">10.1.3. Python modules and programs</a></span></dt> +<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt> </dl></dd> <dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt> <dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd> @@ -3001,8 +2998,7 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u <dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt> <dd><dl> <dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt> -<dt><span class="sect2"><a href="#creating.kde-app">10.1.2. KDE3 & KDE4 applications</a></span></dt> -<dt><span class="sect2"><a href="#creating.python-module">10.1.3. Python modules and programs</a></span></dt> +<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt> </dl></dd> <dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt> <dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd> @@ -3104,15 +3100,7 @@ package from the set of installed files.</p></li> </div> <div class="sect2"> <div class="titlepage"><div><div><h3 class="title"> -<a name="creating.kde-app"></a>10.1.2. KDE3 & KDE4 applications</h3></div></div></div> -<p>KDE3 applications should always include -<code class="filename">meta-pkgs/kde3/kde3.mk</code>, which contains numerous -settings that are typical of KDE3 packages and KDE4 applications should -always include <code class="filename">meta-pkgs/kde4/kde4.mk</code>, respectively.</p> -</div> -<div class="sect2"> -<div class="titlepage"><div><div><h3 class="title"> -<a name="creating.python-module"></a>10.1.3. Python modules and programs</h3></div></div></div> +<a name="creating.python-module"></a>10.1.2. Python modules and programs</h3></div></div></div> <p>Python modules and programs packages are easily created using a set of predefined variables.</p> <p> @@ -8852,7 +8840,7 @@ place.</p></li> 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="idm86822032"></a><dl> +<a name="idm81736208"></a><dl> <dt>22.1. <a href="#devfaq.makeflags">What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?</a> @@ -8897,7 +8885,7 @@ do?</a> <tbody> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.makeflags"></a><a name="idm86821648"></a><p><b>22.1.</b></p> +<a name="devfaq.makeflags"></a><a name="idm81735824"></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 @@ -8913,7 +8901,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.make"></a><a name="idm86817680"></a><p><b>22.2.</b></p> +<a name="devfaq.make"></a><a name="idm81731856"></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 @@ -8931,7 +8919,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.cc"></a><a name="idm86813200"></a><p><b>22.3.</b></p> +<a name="devfaq.cc"></a><a name="idm81727376"></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 @@ -8949,7 +8937,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.bl3flags"></a><a name="idm86809104"></a><p><b>22.4.</b></p> +<a name="devfaq.bl3flags"></a><a name="idm81723280"></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>, @@ -8962,7 +8950,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.bl3prefix"></a><a name="idm86806800"></a><p><b>22.5.</b></p> +<a name="devfaq.bl3prefix"></a><a name="idm81721104"></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> @@ -8978,7 +8966,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.master_sites"></a><a name="idm86803728"></a><p><b>22.6.</b></p> +<a name="devfaq.master_sites"></a><a name="idm81717904"></a><p><b>22.6.</b></p> </td> <td align="left" valign="top"><p>What does <code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I @@ -9002,7 +8990,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.mailinglists"></a><a name="idm86796816"></a><p><b>22.7.</b></p> +<a name="devfaq.mailinglists"></a><a name="idm81710992"></a><p><b>22.7.</b></p> </td> <td align="left" valign="top"><p>Which mailing lists are there for package developers?</p></td> @@ -9027,7 +9015,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.documentation"></a><a name="idm86793104"></a><p><b>22.8.</b></p> +<a name="devfaq.documentation"></a><a name="idm81707280"></a><p><b>22.8.</b></p> </td> <td align="left" valign="top"><p>Where is the pkgsrc documentation?</p></td> @@ -9075,7 +9063,7 @@ do?</a> </tr> <tr class="question"> <td align="left" valign="top"> -<a name="devfaq.too-much-time"></a><a name="idm86786576"></a><p><b>22.9.</b></p> +<a name="devfaq.too-much-time"></a><a name="idm81700752"></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> diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt index 7e9139354bc..78439b99062 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -144,8 +144,7 @@ II. The pkgsrc developer's guide 10.1. Common types of packages 10.1.1. Perl modules - 10.1.2. KDE3 & KDE4 applications - 10.1.3. Python modules and programs + 10.1.2. Python modules and programs 10.2. Examples @@ -1076,7 +1075,6 @@ in PKG_PATH. After these preparations, installing a package is very easy: # pkg_add libreoffice -# pkg_add kde-3.5.7 # pkg_add ap24-php71-* Note that any prerequisite packages needed to run the package in question will @@ -1232,7 +1230,7 @@ You can change these settings either in your shell's environment, or, if you want to keep the settings, by editing the mk.conf file, and adding the definitions there. -If a package depends on many other packages (such as meta-pkgs/kde3), the build +If a package depends on many other packages (such as meta-pkgs/kde4), the build process may alternate between periods of downloading source, and compiling. To ensure you have all the source downloaded initially you can run the command: @@ -2357,8 +2355,7 @@ Table of Contents 10.1. Common types of packages 10.1.1. Perl modules - 10.1.2. KDE3 & KDE4 applications - 10.1.3. Python modules and programs + 10.1.2. Python modules and programs 10.2. Examples @@ -2587,8 +2584,7 @@ Table of Contents 10.1. Common types of packages 10.1.1. Perl modules - 10.1.2. KDE3 & KDE4 applications - 10.1.3. Python modules and programs + 10.1.2. Python modules and programs 10.2. Examples @@ -2680,13 +2676,7 @@ package involves only a few steps. Simple Perl modules are handled automatically by url2pkg, including dependencies. -10.1.2. KDE3 & KDE4 applications - -KDE3 applications should always include meta-pkgs/kde3/kde3.mk, which contains -numerous settings that are typical of KDE3 packages and KDE4 applications -should always include meta-pkgs/kde4/kde4.mk, respectively. - -10.1.3. Python modules and programs +10.1.2. Python modules and programs Python modules and programs packages are easily created using a set of predefined variables. |