From 0a748a305f80de4157a3e8d0d23bdb469d81c5a3 Mon Sep 17 00:00:00 2001 From: jnemeth Date: Tue, 17 Feb 2009 06:17:55 +0000 Subject: regen --- doc/pkgsrc.html | 73 ++++++++++++++++++++++++++++++++------------------------- doc/pkgsrc.txt | 47 +++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 52 deletions(-) diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index 68e8bd4a519..3d76653db8b 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -2291,10 +2291,12 @@ works.

CFLAGS+= -your -flags

Using CFLAGS= (i.e. without the - “+”) may lead to problems with packages that need - to add their own flags. Also, you may want to take a look at - the devel/cpuflags package if - you're interested in optimization for the current CPU.

+ “+”) may lead to problems with packages that + need to add their own flags. You may want to take a look + at the devel/cpuflags + package if you're interested in optimization for the current + CPU. Setting USE_CPUFLAGS to yes in + mk.conf will cause pkgsrc to automatically use cpuflags.

@@ -2959,7 +2961,7 @@ nbftp% chmod 755 .

7.4.1. Preparation

-

First, you need to create a pkgsrc installation for the pbulk infrastructure. No matter on which platform you are (even on NetBSD), you should bootstrap into its own directory. Let's take the directory /usr/pbulk-outer or $HOME/pbulk-outer for it. This installation will be bootstrapped and all the tools that are required for the bulk build will be installed there.

+

First, you need to create a pkgsrc installation for the pbulk infrastructure. No matter on which platform you are (even on NetBSD), you should bootstrap into its own directory. Let's take the directory /usr/pbulk or $HOME/pbulk for it. This installation will be bootstrapped and all the tools that are required for the bulk build will be installed there.

 $ cd /usr/pkgsrc
 $ ./bootstrap/bootstrap --prefix=/usr/pbulk --varbase=/usr/pbulk/var --workdir=/tmp/pbulk-bootstrap
@@ -3278,9 +3280,11 @@ with each package.

methods: multiple CD-ROMs and network FTP/HTTP connections.

  • pkgtools/xpkgwedge: Put X11 packages someplace else (enabled by default).

  • -
  • devel/cpuflags: Determine the - best compiler flags to optimise code for your current CPU and - compiler.

  • +
  • devel/cpuflags: Determine + the best compiler flags to optimise code for your current + CPU and compiler. Setting USE_CPUFLAGS to + yes in mk.conf will cause pkgsrc to automatically use + cpuflags.

  • Utilities for keeping track of installed packages, being up to date, etc:

    @@ -3351,18 +3355,18 @@ enable this feature by adding the option distfile is found, pkgsrc will try to resume it.

    You can also use a different program than the default ftp(1) by changing the -FETCH_CMD variable. Don't forget to set -FETCH_RESUME_ARGS and -FETCH_OUTPUT_ARGS if you are not using default -values.

    +FETCH_USING variable. You can specify the program by +using of ftp, fetch, wget or curl. Alternatively, fetching can be disabled +by using the value manual. A value of custom disables the system defaults +and dependency tracking for the fetch program. In that case you have to +provide FETCH_CMD, FETCH_BEFORE_ARGS, +FETCH_RESUME_ARGS, FETCH_OUTPUT_ARGS, +FETCH_AFTER_ARGS.

    For example, if you want to use -wget to resume downloads, you'll have to use something +wget to download, you'll have to use something like:

    -FETCH_CMD=             wget
    -FETCH_BEFORE_ARGS=     --passive-ftp
    -FETCH_RESUME_ARGS=     -c
    -FETCH_OUTPUT_ARGS=     -O -nc
    +FETCH_USING=	wget
     

    @@ -4666,7 +4670,7 @@ MESSAGE_SUBST+= SOMEVAR="somevalue" X11BASE, PKG_SYSCONFDIR, ROOT_GROUP, and - ROOT_GROUP.

    + ROOT_USER.

    You can display a different or additional files by setting the MESSAGE_SRC variable. Its default is MESSAGE, if the file @@ -5971,7 +5975,9 @@ following:

    ${PKG_SYSCONFBASE}.

    It is worth mentioning that ${PKG_SYSCONFDIR} is -automatically added to OWN_DIRS. See Section 15.1.1, “Directory manipulation” what this means.

    +automatically added to OWN_DIRS. See Section 15.1.1, “Directory manipulation” what this means. This does not apply to +subdirectories of ${PKG_SYSCONFDIR}, they still have to +be created with OWN_DIRS or MAKE_DIRS.

    @@ -6741,6 +6747,9 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS} MASTER_SORT_RANDOM, and MASTER_SORT_AWK or MASTER_SORT_REGEX.

    +

    The specific command and arguments used depend on the + FETCH_USING parameter. The example above is + for FETCH_USING=custom.

    The distfiles mirror run by the NetBSD Foundation uses the mirror-distfiles target to mirror the distfiles, if they are freely distributable. Packages setting @@ -7527,7 +7536,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

    18.4.1.

    +

    18.4.1.

    How do I add a new tool?

    @@ -7537,7 +7546,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

    18.4.2.

    +

    18.4.2.

    How do I get a list of all available tools?

    @@ -7548,7 +7557,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

    18.4.3.

    +

    18.4.3.

    How can I get a list of all the tools that a package is using while being built? I want to know whether it @@ -9000,7 +9009,7 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist get registered in the database:

    1. Include - ../../textproc/scrollkeeper/omf.mk + ../../textproc/rarian/omf.mk instead of its buildlink3.mk file. This takes care of rebuilding the scrollkeeper database at installation and deinstallation time, and disallows any access @@ -9562,7 +9571,7 @@ do? -

      22.1.

      +

      22.1.

      What is the difference between MAKEFLAGS, .MAKEFLAGS and @@ -9578,7 +9587,7 @@ do? -

      22.2.

      +

      22.2.

      What is the difference between MAKE, GMAKE and @@ -9596,7 +9605,7 @@ do? -

      22.3.

      +

      22.3.

      What is the difference between CC, PKG_CC and @@ -9614,7 +9623,7 @@ do? -

      22.4.

      +

      22.4.

      What is the difference between BUILDLINK_LDFLAGS, @@ -9627,7 +9636,7 @@ do? -

      22.5.

      +

      22.5.

      Why does make show-var VARNAME=BUILDLINK_PREFIX.foo @@ -9643,7 +9652,7 @@ do? -

      22.6.

      +

      22.6.

      What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I @@ -9667,7 +9676,7 @@ do? -

      22.7.

      +

      22.7.

      Which mailing lists are there for package developers?

      @@ -9692,7 +9701,7 @@ do? -

      22.8.

      +

      22.8.

      Where is the pkgsrc documentation?

      @@ -9740,7 +9749,7 @@ do? -

      22.9.

      +

      22.9.

      I have a little time to kill. What shall I do?

      diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt index 2bb6461e7cf..c1efe327b20 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -2009,8 +2009,9 @@ instead of the = operator: CFLAGS+= -your -flags Using CFLAGS= (i.e. without the "+") may lead to problems with packages that -need to add their own flags. Also, you may want to take a look at the devel/ -cpuflags package if you're interested in optimization for the current CPU. +need to add their own flags. You may want to take a look at the devel/cpuflags +package if you're interested in optimization for the current CPU. Setting +USE_CPUFLAGS to yes in mk.conf will cause pkgsrc to automatically use cpuflags. 5.4.3. Additional flags to the linker (LDFLAGS) @@ -2588,9 +2589,9 @@ Running a pbulk-style bulk build works roughly as follows: First, you need to create a pkgsrc installation for the pbulk infrastructure. No matter on which platform you are (even on NetBSD), you should bootstrap into -its own directory. Let's take the directory /usr/pbulk-outer or $HOME/ -pbulk-outer for it. This installation will be bootstrapped and all the tools -that are required for the bulk build will be installed there. +its own directory. Let's take the directory /usr/pbulk or $HOME/pbulk for it. +This installation will be bootstrapped and all the tools that are required for +the bulk build will be installed there. $ cd /usr/pkgsrc $ ./bootstrap/bootstrap --prefix=/usr/pbulk --varbase=/usr/pbulk/var --workdir=/tmp/pbulk-bootstrap @@ -2903,7 +2904,8 @@ Utilities used by pkgsrc (not automatically installed): * pkgtools/xpkgwedge: Put X11 packages someplace else (enabled by default). * devel/cpuflags: Determine the best compiler flags to optimise code for your - current CPU and compiler. + current CPU and compiler. Setting USE_CPUFLAGS to yes in mk.conf will cause + pkgsrc to automatically use cpuflags. Utilities for keeping track of installed packages, being up to date, etc: @@ -2963,16 +2965,16 @@ feature by adding the option PKG_RESUME_TRANSFERS=YES into mk.conf. If, during a fetch step, an incomplete distfile is found, pkgsrc will try to resume it. You can also use a different program than the default ftp(1) by changing the -FETCH_CMD variable. Don't forget to set FETCH_RESUME_ARGS and FETCH_OUTPUT_ARGS -if you are not using default values. +FETCH_USING variable. You can specify the program by using of ftp, fetch, wget +or curl. Alternatively, fetching can be disabled by using the value manual. A +value of custom disables the system defaults and dependency tracking for the +fetch program. In that case you have to provide FETCH_CMD, FETCH_BEFORE_ARGS, +FETCH_RESUME_ARGS, FETCH_OUTPUT_ARGS, FETCH_AFTER_ARGS. -For example, if you want to use wget to resume downloads, you'll have to use -something like: +For example, if you want to use wget to download, you'll have to use something +like: -FETCH_CMD= wget -FETCH_BEFORE_ARGS= --passive-ftp -FETCH_RESUME_ARGS= -c -FETCH_OUTPUT_ARGS= -O -nc +FETCH_USING= wget 9.6. How can I install/use modular X.org from pkgsrc? @@ -4063,7 +4065,7 @@ MESSAGE replaces "${SOMEVAR}" with "somevalue" in MESSAGE. By default, substitution is performed for PKGNAME, PKGBASE, PREFIX, LOCALBASE, X11PREFIX, X11BASE, - PKG_SYSCONFDIR, ROOT_GROUP, and ROOT_GROUP. + PKG_SYSCONFDIR, ROOT_GROUP, and ROOT_USER. You can display a different or additional files by setting the MESSAGE_SRC variable. Its default is MESSAGE, if the file exists. @@ -5120,7 +5122,9 @@ basically the following: 3. Otherwise, it is set to ${PKG_SYSCONFBASE}. It is worth mentioning that ${PKG_SYSCONFDIR} is automatically added to -OWN_DIRS. See Section 15.1.1, "Directory manipulation" what this means. +OWN_DIRS. See Section 15.1.1, "Directory manipulation" what this means. This +does not apply to subdirectories of ${PKG_SYSCONFDIR}, they still have to be +created with OWN_DIRS or MAKE_DIRS. 15.2.2. Telling the software where configuration files are @@ -5762,6 +5766,9 @@ of MASTER_SITE_BACKUP. The order of all except the first and the last can be optionally sorted by the user, via setting either MASTER_SORT_RANDOM, and MASTER_SORT_AWK or MASTER_SORT_REGEX. +The specific command and arguments used depend on the FETCH_USING parameter. +The example above is for FETCH_USING=custom. + The distfiles mirror run by the NetBSD Foundation uses the mirror-distfiles target to mirror the distfiles, if they are freely distributable. Packages setting NO_SRC_ON_FTP (usually to "${RESTRICTED}") will not have their @@ -7559,10 +7566,10 @@ take some extra steps to make sure they get registered in the database: If a package installs .omf files, used by scrollkeeper, you need to take some extra steps to make sure they get registered in the database: - 1. Include ../../textproc/scrollkeeper/omf.mk instead of its buildlink3.mk - file. This takes care of rebuilding the scrollkeeper database at - installation and deinstallation time, and disallows any access to it - directly from the package. + 1. Include ../../textproc/rarian/omf.mk instead of its buildlink3.mk file. + This takes care of rebuilding the scrollkeeper database at installation and + deinstallation time, and disallows any access to it directly from the + package. 2. Check the PLIST and remove any entries under the libdata/scrollkeeper directory, as they will be handled automatically. -- cgit v1.2.3