Patch against htdocs as of 20051017 to make a unified NetBSD + pkgsrc Guide. Usage: 1) cd pkgsrc/guide/en 2) apply patch below 3) ln -s /usr/pkgsrc/doc/guide/files/*xml . 4) make - Hubert Feyrer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ap-xml.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/ap-xml.xml,v retrieving revision 1.18 diff -u -r1.18 ap-xml.xml --- ap-xml.xml 16 Oct 2005 21:51:33 -0000 1.18 +++ ap-xml.xml 17 Oct 2005 06:40:18 -0000 @@ -7,7 +7,7 @@ produce a formatted version of the NetBSD guide. Besides that it contains instructions that describe how to build the guide. This appendix assumes knowledge of pkgsrc, see - for details. + for details. Index: chap-fetch.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/chap-fetch.xml,v retrieving revision 1.12 diff -u -r1.12 chap-fetch.xml --- chap-fetch.xml 12 Aug 2005 16:57:29 -0000 1.12 +++ chap-fetch.xml 17 Oct 2005 06:40:24 -0000 @@ -188,7 +188,7 @@ Pkgsrc (package source) is the &os; packages collection which can be used to easily install and deinstall - software on your &os; system. See for + software on your &os; system. See for more information. You should follow the stable branch, unless you're @@ -413,7 +413,7 @@ Pkgsrc (package source) is the &os; packages collection which can be used to easily install and deinstall - software on your &os; system. See for + software on your &os; system. See for more information. Stable pkgsrc branches are created every quarter, hence Index: chap-kernel.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/chap-kernel.xml,v retrieving revision 1.18 diff -u -r1.18 chap-kernel.xml --- chap-kernel.xml 10 Oct 2005 10:29:57 -0000 1.18 +++ chap-kernel.xml 17 Oct 2005 06:40:24 -0000 @@ -220,7 +220,7 @@ available through pkgsrc, analyzes the output of &man.dmesg.8; and automatically generates a minimal configuration file. The installation of packages is described extensively in - in the , but installing + in the , but installing adjustkernel basically boils down to: &uprompt; cd /usr/pkgsrc/sysutils/adjustkernel Index: chap-mail.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/chap-mail.xml,v retrieving revision 1.11 diff -u -r1.11 chap-mail.xml --- chap-mail.xml 5 May 2005 12:21:22 -0000 1.11 +++ chap-mail.xml 17 Oct 2005 06:40:27 -0000 @@ -62,7 +62,7 @@ Of these, only sendmail and m4 are installed with the base system; you can install the other programs from the &os; package collection, - pkgsrc - see . + pkgsrc - see . Before continuing, remember that none of the programs presented in this chapter is mandatory: there are other applications Index: chap-print.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/chap-print.xml,v retrieving revision 1.13 diff -u -r1.13 chap-print.xml --- chap-print.xml 5 May 2005 12:21:22 -0000 1.13 +++ chap-print.xml 17 Oct 2005 06:40:29 -0000 @@ -218,7 +218,7 @@ PostScript document in a sequence of commands that the printer understands. The Ghostscript program, which can be found in packages collection, can be used - to this purpose (see ). This + to this purpose (see ). This section explains how to configure lpd to use Ghostscript to print PostScript files on the HP Deskjet 690C. Index: netbsd.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/netbsd.xml,v retrieving revision 1.35 diff -u -r1.35 netbsd.xml --- netbsd.xml 29 Sep 2005 06:54:56 -0000 1.35 +++ netbsd.xml 17 Oct 2005 06:43:08 -0000 @@ -15,12 +15,15 @@ - The NetBSD Guide + The NetBSD & pkgsrc Guide The NetBSD Developers + + The pkgsrc Developers + $NetBSD: netbsd.xml,v 1.35 2005/09/29 06:54:56 mishka Exp $ @@ -46,8 +49,9 @@ - NetBSD is a - registered trademark of The NetBSD Foundation, Inc. + NetBSD and + pkgsrc are + registered trademarks of The NetBSD Foundation, Inc. @@ -56,10 +60,11 @@ &preface; - About NetBSD + About NetBSD and pkgsrc - &chap-intro; - &chap-whatsnew; + &chap-intro; + &chap.intro; + @@ -107,12 +112,43 @@ &chap-build; &chap-kernel; &chap-cons; - &chap-pack; + - + + + The pkgsrc user's guide + + &chap.getting; + &chap.platform; + &chap.using; + &chap.configuring; + &chap.binary; + &chap.faq; + + + + + The pkgsrc developer's guide + + &chap.components; + &chap.makefile; + &chap.plist; + &chap.buildlink; + &chap.pkginstall; + &chap.options; + &chap.build; + &chap.fixes; + &chap.debug; + &chap.submit; + + &appendix; + &chap.examples; + &chap.logs; + &chap.ftp-layout; + &chap.editing; &ap-contrib; &ap-xml; &ap-ack; Index: preface.xml =================================================================== RCS file: /cvsroot/htdocs/guide/en/preface.xml,v retrieving revision 1.10 diff -u -r1.10 preface.xml --- preface.xml 5 May 2005 12:21:23 -0000 1.10 +++ preface.xml 17 Oct 2005 06:43:13 -0000 @@ -3,13 +3,28 @@ Purpose of this guide - This guide describes the installation and the configuration of the + + This guide actually consists of two seperate guides, the NetBSD + Guide and the pkgsrc Guide. + + + The NetBSD guide describes the installation and the configuration of the &os; operating system as well as setup and administration of some of its subsystems. It addresses mainly people coming from other operating systems in hope of being useful for the solution of the many small problems found when one starts using a new tool. + + The pkgsrc Guide documents pkgsrc, the NetBSD Packages Collection + which can be used to add third party software after installing + the base operating system. The pkgsrc uer's guide covers the + basics of pkgsrc, setup and installation by compiling from source + and from binary packages is supported. The pkgsrc developer's + guide goes into details that are useful when you want to start + creating packages on your own. + + This guide is not a Unix tutorial: a basic knowledge of some concepts and tools is required to understand it. You should know, for example, what a file and a directory are and how to use an