From 51fbf773183f1844cd8eb362a333a3d5e34d85fc Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 26 May 2013 18:22:59 +0000 Subject: regen --- doc/pkgsrc.html | 42 +++++++++++++++++++++++++++--------------- doc/pkgsrc.txt | 19 ++++++++++++++----- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index 6f83fc6b3fa..3b0188a98d2 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -7658,7 +7658,7 @@ TOOLS_PLATFORM.true?= true # shell builtin

18.4. Questions regarding the tools

-
+
18.4.1. How do I add a new tool?
18.4.2. How do I get a list of all available @@ -7677,7 +7677,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.1.

+

18.4.1.

How do I add a new tool?

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

18.4.2.

+

18.4.2.

How do I get a list of all available tools?

@@ -7698,7 +7698,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 @@ -8092,13 +8092,25 @@ ACCEPTABLE_LICENSES+=xv-license

  1. If your package needs another package's binaries or - libraries to build or run, and if that package has a + libraries to build and run, and if that package has a buildlink3.mk file available, use it:

     .include "../../graphics/jpeg/buildlink3.mk"
  2. +

    If your package needs another package's binaries or + libraries only for building, and if that package has a + buildlink3.mk file available, use it:

    +
    +.include "../../graphics/jpeg/buildlink3.mk"
+
    +

    but set + BUILDLINK_DEPMETHOD.jpeg?=build + to make it a build dependency only. This case is rather + rare.

    +
    3. +

  3. If your package needs binaries from another package to build, use the BUILD_DEPENDS definition:

    @@ -9748,7 +9760,7 @@ place.
    4. and if you still don't have the answer, ask on the pkgsrc-users mailing list.

    -
    +
    22.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS? @@ -9793,7 +9805,7 @@ do? -

    22.1.

    +

    22.1.

    What is the difference between MAKEFLAGS, .MAKEFLAGS and @@ -9809,7 +9821,7 @@ do? -

    22.2.

    +

    22.2.

    What is the difference between MAKE, GMAKE and @@ -9827,7 +9839,7 @@ do? -

    22.3.

    +

    22.3.

    What is the difference between CC, PKG_CC and @@ -9845,7 +9857,7 @@ do? -

    22.4.

    +

    22.4.

    What is the difference between BUILDLINK_LDFLAGS, @@ -9858,7 +9870,7 @@ do? -

    22.5.

    +

    22.5.

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

    22.6.

    +

    22.6.

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

    22.7.

    +

    22.7.

    Which mailing lists are there for package developers?

    @@ -9923,7 +9935,7 @@ do? -

    22.8.

    +

    22.8.

    Where is the pkgsrc documentation?

    @@ -9971,7 +9983,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 b841779522c..f8bd396b0c8 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -6811,23 +6811,32 @@ The format for a BUILD_DEPENDS and a DEPENDS definition is: Please note that the "pre-req-package-name" may include any of the wildcard version numbers recognized by pkg_info(1). - 1. If your package needs another package's binaries or libraries to build or + 1. If your package needs another package's binaries or libraries to build and run, and if that package has a buildlink3.mk file available, use it: .include "../../graphics/jpeg/buildlink3.mk" - 2. If your package needs binaries from another package to build, use the + 2. If your package needs another package's binaries or libraries only for + building, and if that package has a buildlink3.mk file available, use it: + + .include "../../graphics/jpeg/buildlink3.mk" + + + but set BUILDLINK_DEPMETHOD.jpeg?=build to make it a build dependency only. + This case is rather rare. + + 3. If your package needs binaries from another package to build, use the BUILD_DEPENDS definition: BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons - 3. If your package needs a library with which to link and there is no + 4. If your package needs a library with which to link and there is no buildlink3.mk file available, create one. Using DEPENDS won't be sufficient because the include files and libraries will be hidden from the compiler. - 4. If your package needs some executable to be able to run correctly and if + 5. If your package needs some executable to be able to run correctly and if there's no buildlink3.mk file, this is specified using the DEPENDS variable. The print/lyx package needs to be able to execute the latex binary from the teTeX package when it runs, and that is specified: @@ -6835,7 +6844,7 @@ version numbers recognized by pkg_info(1). DEPENDS+= teTeX-[0-9]*:../../print/teTeX - 5. You can use wildcards in package dependencies. Note that such wildcard + 6. You can use wildcards in package dependencies. Note that such wildcard dependencies are retained when creating binary packages. The dependency is checked when installing the binary package and any package which matches the pattern will be used. Wildcard dependencies should be used with care. -- cgit v1.2.3