pkgsrc Handbook patch
Erik Wikström
erik-wikstrom at telia.com
Sat Apr 15 10:19:24 PDT 2006
On 2006-04-15 08:45, nida at xxxxxxxx wrote:
All,
Comments and feedback are requested. Basically, this is a big s/ports/pkgsrc/
in the handbook.
Diff Link:
http://leaf.dragonflybsd.org/~labthug/pkgsrcHandbook.diff
Built Version:
http://leaf.dragonflybsd.org/~labthug/handbook/
Based on what I get back, I will reiterate. When that's finalized, I'll send
this to submit.
Things to note. There are several ports that don't have accompanying packages
(that I know of). I commented these for now. Better ideas are appreciated.
Feeling inspired I made a pass and changed some of those Adrian missed,
these patched are again HEAD since I didn't know if the formatting
changes in Adrians patch were good or not. The patches are named after
the section changed
The only major changes was to remove the /usr/ports /usr/dfports etc
from the directory-structure in 3.4 and to remove 21.3 (ports updates),
the rest is just s/ports/pkgsrc/.
I also noticed that under Typographic Conventions in the Preface
"monospaced" is in italics and not monospaced, didn't know how to change
that one however since there are many different types of monospaced text.
Erik Wikström
--
"I have always wished for my computer to be as easy to use as my
telephone; my wish has come true because I can no longer figure
out how to use my telephone" -- Bjarne Stroustrup
Index: preface.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/preface/preface.sgml,v
retrieving revision 1.5
diff -u -r1.5 preface.sgml
--- preface.sgml 6 Sep 2005 17:27:39 -0000 1.5
+++ preface.sgml 15 Apr 2006 15:26:28 -0000
@@ -70,9 +70,8 @@
<varlistentry>
<term><emphasis><xref linkend="ports">, Installing Applications</emphasis></term>
<listitem>
- <para>Covers the installation of third-party software with
- both &os;'s innovative <quote>Ports Collection</quote> and standard
- binary packages.</para>
+ <para>Covers the installation of third-party software using
+ &netbsd;'s Packages Collection &pkgsrc;.
</listitem>
</varlistentry>
<varlistentry>
Index: chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/basics/chapter.sgml,v
retrieving revision 1.9
diff -u -r1.9 chapter.sgml
--- chapter.sgml 6 Mar 2006 05:36:04 -0000 1.9
+++ chapter.sgml 15 Apr 2006 15:31:23 -0000
@@ -788,11 +788,6 @@
</row>
<row>
- <entry><filename class="directory">/usr/dfports</filename></entry>
- <entry>The &os; ports collection (optional).</entry>
- </row>
-
- <row>
<entry><filename class="directory">/usr/include/</filename></entry>
<entry>Standard C include files.</entry>
</row>
@@ -818,16 +813,12 @@
<entry><filename
class="directory">/usr/local/</filename></entry>
- <entry>Local executables, libraries, etc. Also used as
- the default destination for the FreeBSD ports
- framework. Within <filename>/usr/local</filename>,
- the general layout sketched out by &man.hier.7; for
- <filename>/usr</filename> should be used. Exceptions
- are the man directory, which is directly under
- <filename>/usr/local</filename> rather than under
- <filename>/usr/local/share</filename>, and the ports
- documentation is in
- <filename>share/doc/<replaceable>port</replaceable></filename>.
+ <entry>Local executables, libraries, etc. Within
+ <filename>/usr/local</filename>, the general layout sketched
+ out by &man.hier.7; for <filename>/usr</filename> should be
+ used. An exceptions is the man directory, which is directly
+ under <filename>/usr/local</filename> rather than under
+ <filename>/usr/local/share</filename>.
</entry>
</row>
@@ -851,11 +842,6 @@
<entry><filename class="directory">/usr/pkgsrc</filename></entry>
<entry>The &pkgsrc; collection for installing packages (optional).</entry>
</row>
-
- <row>
- <entry><filename class="directory">/usr/ports</filename></entry>
- <entry>The FreeBSD ports collection (optional).</entry>
- </row>
<row>
<entry><filename class="directory">/usr/sbin/</filename></entry>
Index: basics/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/basics/chapter.sgml,v
retrieving revision 1.9
diff -u -r1.9 chapter.sgml
--- basics/chapter.sgml 6 Mar 2006 05:36:04 -0000 1.9
+++ basics/chapter.sgml 15 Apr 2006 15:34:09 -0000
@@ -2011,8 +2011,8 @@
variables. &os; comes with a set of shells, such as
<command>sh</command>, the Bourne Shell, and <command>tcsh</command>,
the improved C-shell. Many other shells are available
- from &pkgsrc; and the FreeBSD Ports collections, such as
- <command>zsh</command> and <command>bash</command>.</para>
+ from &pkgsrc;, such as <command>zsh</command> and
+ <command>bash</command>.</para>
<para>Which shell do you use? It is really a matter of taste. If you
are a C programmer you might feel more comfortable with a C-like shell
Index: basics/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/basics/chapter.sgml,v
retrieving revision 1.9
diff -u -r1.9 chapter.sgml
--- basics/chapter.sgml 6 Mar 2006 05:36:04 -0000 1.9
+++ basics/chapter.sgml 15 Apr 2006 15:39:18 -0000
@@ -2255,7 +2255,7 @@
<para>&os; also comes with more powerful text editors such as
<application>vi</application> as part of the base system, while other editors, like
<application>emacs</application> and <application>vim</application>,
- are part of the &pkgsrc; and FreeBSD Ports collections. These editors offer much
+ are part of the &pkgsrc; collection. These editors offer much
more functionality and power at the expense of being a little more
complicated to learn. However if you plan on doing a lot of text
editing, learning a more powerful editor such as
Index: x11/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/x11/chapter.sgml,v
retrieving revision 1.6
diff -u -r1.6 chapter.sgml
--- x11/chapter.sgml 6 Sep 2005 17:36:31 -0000 1.6
+++ x11/chapter.sgml 15 Apr 2006 15:44:42 -0000
@@ -161,7 +161,7 @@
button or similar device; some are <quote>themeable</quote>, allowing
a complete change of look-and-feel by applying a new theme. These
window managers, and many more, are available in the
- <filename>x11-wm</filename> category of the Ports Collection.</para>
+ <filename>wm</filename> category of &pkgsrc;.</para>
<para>In addition, the <application>KDE</application> and
<application>GNOME</application> desktop environments both have their
Index: config/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/config/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- config/chapter.sgml 11 Mar 2006 04:39:33 -0000 1.10
+++ config/chapter.sgml 15 Apr 2006 15:52:56 -0000
@@ -135,9 +135,8 @@
</para>
<para>The <filename>/usr</filename> partition holds much
- of the files required to support the system, the &man.ports.7;
- collection (recommended) and the source code (optional). Both
- of which are optional at install time.
+ of the files required to support the system, the &pkgsrc;
+ collection (recommended) and the source code (optional).
At least 2 gigabytes would be recommended for this partition.</para>
<para>When selecting partition sizes, keep the space
Index: users/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/users/chapter.sgml,v
retrieving revision 1.2
diff -u -r1.2 chapter.sgml
--- users/chapter.sgml 2 Aug 2004 18:47:46 -0000 1.2
+++ users/chapter.sgml 15 Apr 2006 15:55:11 -0000
@@ -456,7 +456,7 @@
<para>In summary, we changed the default shell to
<application>zsh</application> (an additional shell found in
- the Ports Collection), and turned off the sending of a welcome mail to
+ &pkgsrc;), and turned off the sending of a welcome mail to
added users. We then saved the configuration,
created an account for <username>jru</username>, and made
sure <username>jru</username> is in <username>wheel</username>
Index: kernelconfig/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/kernelconfig/chapter.sgml,v
retrieving revision 1.5
diff -u -r1.5 chapter.sgml
--- kernelconfig/chapter.sgml 6 Sep 2005 17:33:34 -0000 1.5
+++ kernelconfig/chapter.sgml 15 Apr 2006 16:00:19 -0000
@@ -570,7 +570,7 @@
hard drive partition at boot time, you can safely comment this out.
It will be automatically loaded the first time you mount a DOS
partition, as described above. Also, the excellent
- <application>mtools</application> software (in the ports collection)
+ <application>mtools</application> software (in &pkgsrc;)
allows you to access DOS floppies without having to mount and
unmount them (and does not require <literal>MSDOSFS</literal> at
all).</para>
Index: printing/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/printing/chapter.sgml,v
retrieving revision 1.3
diff -u -r1.3 chapter.sgml
--- printing/chapter.sgml 6 Sep 2005 17:35:13 -0000 1.3
+++ printing/chapter.sgml 15 Apr 2006 16:10:51 -0000
@@ -1473,8 +1473,7 @@
<filename>/usr/libexec/lpr/lpf</filename>, that works with many
printers that can print plain text. (It handles backspacing and tabs
in the file, and does accounting, but that is about all it does.)
- There are also several filters and filter components in the FreeBSD
- Ports Collection.</para>
+ There are also several filters and filter components in &pkgsrc;.</para>
<para>Here is what you will find in this section:</para>
@@ -1885,9 +1884,9 @@
special text filter for your printer, you can make your
non &postscript; printer act like a real &postscript; printer.</para>
- <para>Ghostscript is in the FreeBSD Ports Collection, if you
- would like to install it from there. You can fetch, build, and
- install it quite easily yourself, as well.</para>
+ <para>Ghostscript is in &pkgsrc;, if you would like to install it
+ from there. You can fetch, build, and install it quite easily
+ yourself, as well.</para>
<para>To simulate &postscript;, we have the text filter detect if it is
printing a &postscript; file. If it is not, then the filter will pass
@@ -2377,7 +2376,7 @@
<secondary>filters</secondary>
<tertiary>apsfilter</tertiary>
</indexterm>
- <para>The FreeBSD Ports Collection has a text filter that performs
+ <para>The &pkgsrc; collection has a text filter that performs
automatic conversion called <command>apsfilter</command>. It can
detect plain text, &postscript;, and DVI files, run the proper
conversions, and print.</para>
Index: disks/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/disks/chapter.sgml,v
retrieving revision 1.4
diff -u -r1.4 chapter.sgml
--- disks/chapter.sgml 30 Jun 2005 16:15:31 -0000 1.4
+++ disks/chapter.sgml 15 Apr 2006 16:15:16 -0000
@@ -1581,8 +1581,7 @@
<title>Using the Floppy</title>
<para>To use the floppy, mount it with &man.mount.msdos.8;. One can also use
- <filename role="package">emulators/mtools</filename> from the ports
- collection.</para>
+ <filename role="package">sysutils/mtools</filename> from &pkgsrc;.</para>
</sect2>
</sect1>
Index: multimedia/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/multimedia/chapter.sgml,v
retrieving revision 1.6
diff -u -r1.6 chapter.sgml
--- multimedia/chapter.sgml 6 Sep 2005 00:28:14 -0000 1.6
+++ multimedia/chapter.sgml 15 Apr 2006 16:19:50 -0000
@@ -24,9 +24,9 @@
to enjoy high fidelity output from your computer. This includes
the ability to record and playback audio in the MPEG Audio Layer
3 (MP3), WAV, and Ogg Vorbis formats as well as many other
- formats. The &pkgsrc; and FreeBSD Ports collections also contain
- applications allowing you to edit your recorded audio, add sound
- effects, and control attached MIDI devices.</para>
+ formats. The &pkgsrc; collection also contain applications
+ allowing you to edit your recorded audio, add sound effects, and
+ control attached MIDI devices.</para>
<para>With some willingness to experiment, &os; can support
playback of video files and DVD's. The number of applications
Index: multimedia/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/multimedia/chapter.sgml,v
retrieving revision 1.6
diff -u -r1.6 chapter.sgml
--- multimedia/chapter.sgml 6 Sep 2005 00:28:14 -0000 1.6
+++ multimedia/chapter.sgml 15 Apr 2006 16:22:38 -0000
@@ -1001,7 +1001,7 @@
<indexterm><primary>video packages</primary></indexterm>
<para>This section discusses the software available from the
- &pkgsrc; and FreeBSD Ports collections which can be used for video playback.
+ &pkgsrc; collection which can be used for video playback.
Video playback is a very active area of software development,
and the capabilities of various applications are bound to
diverge somewhat from the descriptions given here.</para>
@@ -1070,7 +1070,7 @@
</listitem>
<listitem>
- <para>Software not yet in the &pkgsrc; or FreeBSD Ports collections
+ <para>Software not yet in the &pkgsrc; collection
which is commonly used in conjunction with the application.</para>
</listitem>
Index: cutting-edge/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.3
diff -u -r1.3 chapter.sgml
--- cutting-edge/chapter.sgml 27 Jun 2005 23:22:08 -0000 1.3
+++ cutting-edge/chapter.sgml 15 Apr 2006 16:36:36 -0000
@@ -19,15 +19,12 @@
<sect1 id="updating-setup">
<title>Initial Setup</title>
- <para>Updates to the DragonFly source, the ports system, and the dfports
- system are all performed using <application>cvsup</application>.
- <application>cvsup</application> compares your local system source or
- ports files to a remote repository, and downloads any changes. Only the
+ <para>Updates to the DragonFly source is performed using <application>cvsup</application>.
+ <application>cvsup</application> compares your local system source
+ files to a remote repository, and downloads any changes. Only the
differences in the files are downloaded, saving on bandwidth and time.</para>
- <para><application>cvsup</application> exists as a port
- (<filename role="package">net/cvsup</filename>) and traditionally had to be
- installed separately on FreeBSD. With &os;, the port is installed as part
+ <para>With &os;, <application>cvsup</application> is installed as part
of the base system.</para>
</sect1>
@@ -48,12 +45,10 @@
*default compress
-cvs-src
-cvs-dfports</programlisting>
+cvs-src</programlisting>
<para>Alternately, the file <filename>/usr/share/examples/cvsup/DragonFly-src-supfile</filename>
- can be used as-is to update system source. Add the line <userinput>cvs-dfports</userinput> to
- also update the dfports collection.</para>
+ can be used as-is to update system source.</para>
<!--
@@ -62,21 +57,9 @@
<para>Run cvsup using <filename>/usr/share/examples/cvsup/DragonFly-src-supfile</filename>
as an argument or with a separate file containing the above example text. Your system
- source files will be updated, and (if you include <userinput>cvs-dfports</userinput>)
- your dfports overrides will also be up-to-date.</para>
+ source files will be updated.</para>
</sect1>
- <sect1 id="updating-ports">
- <title>Port updates</title>
- <para>Assuming you have already completed the above steps to update your system
- source and dfports, updating ports is very simple:</para>
-
- <screen>cvsup -h <userinput>hostname</userinput> /usr/src/share/examples/cvsup/FreeBSD-ports-supfile</screen>
-
- <para><userinput>hostname</userinput> should be the closest mirror to you. A
- list of mirrors sites can be found on the
- <ulink url="http://www.dragonflybsd.org/main/download.cgi">&os; website</ulink>.</para>
- </sect1>
<sect1 id="updating-before-building">
<title>Preparing to Update</title>
More information about the Docs
mailing list