From a0e17fb7790dbccf656de4c2ced7205a3bd13586 Mon Sep 17 00:00:00 2001 From: mishka Date: Fri, 20 Mar 2009 15:14:07 +0000 Subject: Regen. --- doc/pkgsrc.html | 70 ++++++++++++++++++++++++++++++++++++++++----------------- doc/pkgsrc.txt | 49 +++++++++++++++++++++++++++++----------- 2 files changed, 85 insertions(+), 34 deletions(-) diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index eb052d43f46..1ee25bf722a 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -366,7 +366,7 @@ builds)
19.6.7. Packages installing info files
19.6.8. Packages installing man pages
19.6.9. Packages installing GConf data files
-
19.6.10. Packages installing scrollkeeper data files
+
19.6.10. Packages installing scrollkeeper/rarian data files
19.6.11. Packages installing X11 fonts
19.6.12. Packages installing GTK2 modules
19.6.13. Packages installing SGML or XML data
@@ -3854,7 +3854,7 @@ anymore, you can remove that file and run cvs -q u
19.6.7. Packages installing info files
19.6.8. Packages installing man pages
19.6.9. Packages installing GConf data files
-
19.6.10. Packages installing scrollkeeper data files
+
19.6.10. Packages installing scrollkeeper/rarian data files
19.6.11. Packages installing X11 fonts
19.6.12. Packages installing GTK2 modules
19.6.13. Packages installing SGML or XML data
@@ -5307,6 +5307,33 @@ PLIST_SUBST+= SOMEVAR="somevalue"

This replaces all occurrences of “${SOMEVAR}” in the PLIST with “somevalue”.

+

The PLIST_VARS can be used to simplify + the common case of conditionally including some + PLIST entries. It can be done by adding + PLIST_VARS+=foo and + setting the coresponding PLIST.foo variable + to yes, if the entry should be included. + This will substitute “${PLIST.foo}” + in the PLIST with either + “""” or + “"@comment "”. + For example, in Makefile:

+
+PLIST_VARS+=	foo
+.if condition
+PLIST.foo=	yes
+.else
+
+

And then in PLIST:

+
+@comment $NetBSD$
+bin/bar
+man/man1/bar.1
+${PLIST.foo}bin/foo
+${PLIST.foo}man/man1/foo.1
+${PLIST.foo}share/bar/foo.data
+${PLIST.foo}@dirrm share/bar
+

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

18.4.1.

+

18.4.1.

How do I add a new tool?

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

18.4.2.

+

18.4.2.

How do I get a list of all available tools?

@@ -7655,7 +7682,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 @@ -7728,7 +7755,7 @@ TOOLS_PLATFORM.true?= true # shell builtin

19.6.7. Packages installing info files
19.6.8. Packages installing man pages
19.6.9. Packages installing GConf data files
-
19.6.10. Packages installing scrollkeeper data files
+
19.6.10. Packages installing scrollkeeper/rarian data files
19.6.11. Packages installing X11 fonts
19.6.12. Packages installing GTK2 modules
19.6.13. Packages installing SGML or XML data
@@ -9098,14 +9125,14 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist

-19.6.10. Packages installing scrollkeeper data files

+19.6.10. Packages installing scrollkeeper/rarian data files

If a package installs .omf files, used by - scrollkeeper, you need to take some extra steps to make sure they + scrollkeeper/rarian, you need to take some extra steps to make sure they get registered in the database:

  1. Include - ../../textproc/rarian/omf.mk - instead of its buildlink3.mk file. This + ../../mk/omf-scrollkeeper.mk + instead of rarian's 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. @@ -9113,7 +9140,8 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist libdata/scrollkeeper directory, as they will be handled automatically.

  2. Remove the share/omf directory from - the PLIST. It will be handled by scrollkeeper.

    3. + the PLIST. It will be handled by rarian. (make + print-PLIST does this automatically.)

@@ -9666,7 +9694,7 @@ do? -

22.1.

+

22.1.

What is the difference between MAKEFLAGS, .MAKEFLAGS and @@ -9682,7 +9710,7 @@ do? -

22.2.

+

22.2.

What is the difference between MAKE, GMAKE and @@ -9700,7 +9728,7 @@ do? -

22.3.

+

22.3.

What is the difference between CC, PKG_CC and @@ -9718,7 +9746,7 @@ do? -

22.4.

+

22.4.

What is the difference between BUILDLINK_LDFLAGS, @@ -9731,7 +9759,7 @@ do? -

22.5.

+

22.5.

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

22.6.

+

22.6.

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

22.7.

+

22.7.

Which mailing lists are there for package developers?

@@ -9796,7 +9824,7 @@ do? -

22.8.

+

22.8.

Where is the pkgsrc documentation?

@@ -9844,7 +9872,7 @@ do? -

22.9.

+

22.9.

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

@@ -10027,7 +10055,7 @@ solution is given. After applying the solution be sure to Installs OMF files under share/omf. -See Section 19.6.10, “Packages installing scrollkeeper data files”. +See Section 19.6.10, “Packages installing scrollkeeper/rarian data files”. Installs icons under the diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt index e3361898c84..007aa81a286 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -355,7 +355,7 @@ II. The pkgsrc developer's guide 19.6.7. Packages installing info files 19.6.8. Packages installing man pages 19.6.9. Packages installing GConf data files - 19.6.10. Packages installing scrollkeeper data files + 19.6.10. Packages installing scrollkeeper/rarian data files 19.6.11. Packages installing X11 fonts 19.6.12. Packages installing GTK2 modules 19.6.13. Packages installing SGML or XML data @@ -3404,7 +3404,7 @@ Table of Contents 19.6.7. Packages installing info files 19.6.8. Packages installing man pages 19.6.9. Packages installing GConf data files - 19.6.10. Packages installing scrollkeeper data files + 19.6.10. Packages installing scrollkeeper/rarian data files 19.6.11. Packages installing X11 fonts 19.6.12. Packages installing GTK2 modules 19.6.13. Packages installing SGML or XML data @@ -4572,6 +4572,29 @@ PLIST_SUBST+= SOMEVAR="somevalue" This replaces all occurrences of "${SOMEVAR}" in the PLIST with "somevalue". +The PLIST_VARS can be used to simplify the common case of conditionally +including some PLIST entries. It can be done by adding PLIST_VARS+=foo and +setting the coresponding PLIST.foo variable to yes, if the entry should be +included. This will substitute "${PLIST.foo}" in the PLIST with either """" or +""@comment "". For example, in Makefile: + +PLIST_VARS+= foo +.if condition +PLIST.foo= yes +.else + + +And then in PLIST: + +@comment $NetBSD$ +bin/bar +man/man1/bar.1 +${PLIST.foo}bin/foo +${PLIST.foo}man/man1/foo.1 +${PLIST.foo}share/bar/foo.data +${PLIST.foo}@dirrm share/bar + + 13.5. Man page compression Man pages should be installed in compressed form if MANZ is set (in @@ -6530,7 +6553,7 @@ Table of Contents 19.6.7. Packages installing info files 19.6.8. Packages installing man pages 19.6.9. Packages installing GConf data files - 19.6.10. Packages installing scrollkeeper data files + 19.6.10. Packages installing scrollkeeper/rarian data files 19.6.11. Packages installing X11 fonts 19.6.12. Packages installing GTK2 modules 19.6.13. Packages installing SGML or XML data @@ -7622,21 +7645,21 @@ take some extra steps to make sure they get registered in the database: .entries files installed by the package, if any. Names must not contain any directories in them. -19.6.10. Packages installing scrollkeeper data files +19.6.10. Packages installing scrollkeeper/rarian data files -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: +If a package installs .omf files, used by scrollkeeper/rarian, you need to take +some extra steps to make sure they get registered in the database: - 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. + 1. Include ../../mk/omf-scrollkeeper.mk instead of rarian's 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. 3. Remove the share/omf directory from the PLIST. It will be handled by - scrollkeeper. + rarian. (make print-PLIST does this automatically.) 19.6.11. Packages installing X11 fonts @@ -8320,8 +8343,8 @@ Table 23.1. PLIST handling for GNOME packages | If the package... | Then... | |-------------------------------------------+---------------------------------| | |See Section 19.6.10, "Packages | -|Installs OMF files under share/omf. |installing scrollkeeper data | -| |files". | +|Installs OMF files under share/omf. |installing scrollkeeper/rarian | +| |data files". | |-------------------------------------------+---------------------------------| |Installs icons under the share/icons/ |See Section 19.6.19, "Packages | |hicolor hierarchy or updates share/icons/ |installing hicolor theme icons". | -- cgit v1.2.3