From 97f8542def1dfa26dae19811e35e6f08f3bba329 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Sat, 20 Nov 2004 13:26:39 +0000
Subject: re-gen

---
 doc/pkgsrc.txt | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

(limited to 'doc/pkgsrc.txt')

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 0c4d1813fae..499cb273323 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -1410,8 +1410,15 @@ Utilities used by pkgsrc (not automatically installed):
   * pkgtools/pkg_tarup: create a binary package from an already-installed
     package. used by 'make replace' to save the old package
    
+  * pkgtools/dfdisk: adds extra functionality to pkgsrc, allowing it to fetch
+    distfiles from multiple locations. It currently supports the following
+    methods: multiple CD-ROMs and network FTP/HTTP connections.
+   
   * pkgtools/xpkgwedge: put X11 packages someplace else (enabled by default)
    
+  * devel/cpuflags: will determine the best compiler flags to optimise code for
+    your current CPU and compiler.
+   
 Utilities for keeping track of installed packages, being up to date, etc:
 
   * pkgtools/pkg_chk: installs pkg_chk, which reports on packages whose
@@ -1930,32 +1937,6 @@ compile and run perfectly on NetBSD. The files are applied successively in
 alphabetic order (as returned by a shell "patches/patch-*" glob expansion), so
 patch-aa is applied before patch-ab, etc.
 
-Patch files which are optional and will depend on local site configuration can
-be included with names matching the pattern patches/patch-optional-*. Their
-suffixes should match the configuration options. The selected optional patch
-file names should be assigned to the variable OPTIONAL_PATCHFILES. They will
-not be applied by default.
-
-For example if a package data file needs patching to indicate the default local
-printer paper size as specified in the $PAPERSIZE file you can include patches
-for all the possible paper sizes other than the one the package comes
-configured for by default. In this case you might have a patch called
-"patch-optional-Letter-papersize" and/or another patch called
-"patch-optional-A4-papersize". In your Makefile you would select between them
-with the following construct:
-
-            
-   PATCHDIR=    ${.CURDIR}/patches
-   .if exists(${PATCHDIR}/patch-optional-${PAPERSIZE}-papersize)
-        OPTIONAL_PATCHFILES+= ${PATCHDIR}/patch-optional-${PAPERSIZE}-papersize
-   .endif 
-
-Note that you have to define the value of PATCHDIR in order to use it in a ".if
-" statement like this as otherwise it's not defined until too late during the
-processing of the Makefile. You should use a ".if" statement in order to avoid
-problems should the configuration item ($PAPERSIZE in this example) be set to
-an unexpected value.
-
 The patch-* files should be in diff -bu format, and apply without a fuzz to
 avoid problems. (To force patches to apply with fuzz you can set
 PATCH_FUZZ_FACTOR=-F2). Furthermore, do not put changes for more than one file
-- 
cgit v1.2.3