From 98f6fb813a6ce92bda00789f5b6136c3b2e064ec Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 6 Jun 2012 07:40:01 +0000 Subject: regen --- doc/pkgsrc.html | 75 ++++++++++++++++++++++++++++++--------------------------- doc/pkgsrc.txt | 42 ++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 54 deletions(-) diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index d9dd2c534b1..d64c64d7599 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -390,7 +390,7 @@ builds)
21.1. Submitting binary packages
21.2. Submitting source packages (for non-NetBSD-developers)
21.3. General notes when adding, updating, or removing packages
-
21.4. Committing: Importing a package into CVS
+
21.4. Committing: Adding a package to CVS
21.5. Updating a package to a newer version
21.6. Renaming a package in pkgsrc
21.7. Moving a package in pkgsrc
@@ -3799,7 +3799,7 @@ anymore, you can remove that file and run cvs -q u
21.1. Submitting binary packages
21.2. Submitting source packages (for non-NetBSD-developers)
21.3. General notes when adding, updating, or removing packages
-
21.4. Committing: Importing a package into CVS
+
21.4. Committing: Adding a package to CVS
21.5. Updating a package to a newer version
21.6. Renaming a package in pkgsrc
21.7. Moving a package in pkgsrc
@@ -7545,7 +7545,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 @@ -7562,7 +7562,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.1.

+

18.4.1.

How do I add a new tool?

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

18.4.2.

+

18.4.2.

How do I get a list of all available tools?

@@ -7583,7 +7583,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 @@ -9373,7 +9373,7 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist

21.1. Submitting binary packages
21.2. Submitting source packages (for non-NetBSD-developers)
21.3. General notes when adding, updating, or removing packages
-
21.4. Committing: Importing a package into CVS
+
21.4. Committing: Adding a package to CVS
21.5. Updating a package to a newer version
21.6. Renaming a package in pkgsrc
21.7. Moving a package in pkgsrc
@@ -9459,31 +9459,34 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist makes the cvs commands use the main repository.

-
+

-21.4. Committing: Importing a package into CVS

+21.4. Committing: Adding a package to CVS

This section is only of interest for pkgsrc developers with write - access to the pkgsrc repository. Please remember that cvs - imports files relative to the current working directory, and that - the pathname that you - give the cvs import command is so that it knows where - to place the files in the repository. Newly created packages should be - imported with a vendor tag of “TNF” and a release tag of - “pkgsrc-base”, e.g:

-
-$ cd .../pkgsrc/category/pkgname
-$ cvs import pkgsrc/category/pkgname TNF pkgsrc-base
+  access to the pkgsrc repository.

+
When the package is finished, “cvs add” the files.
+Start by adding the directory and then files in the directory. Don't
+forget to add the new package to the category's
+Makefile. Make sure you don't forget any files;
+you can check by running “cvs status”. An example:

+
+$ cd .../pkgsrc/category
+$ cvs add pkgname
+$ cd pkgname
+$ cvs add DESCR Makefile PLIST distinfo buildlink3.mk patches
+$ cvs add patches/p*
+$ cvs status | less
+$ cd ..
+$ vi Makefile # add SUBDIRS+=pkgname line
+$ cvs commit Makefile pkgname
 

-
Remember to move the directory from which you imported out of
-  the way, or cvs will complain the next time you “cvs
-  update” your source tree.  Also don't forget to add the new
-  package to the category's Makefile.

 
The commit message of the initial import should include part of the
   DESCR file, so people reading the mailing lists know
   what the package is/does.

-
For new packages, “cvs import” is preferred to “cvs
-  add” because the former gets everything with a single command,
-  and provides a consistent tag.

+
Also mention the new package in
+pkgsrc/doc/CHANGES-20xx.

+
Previously, “cvs import” was suggested, but it was
+much easier to get wrong than “cvs add”.

 
 

 

@@ -9584,7 +9587,7 @@ place.

 	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?
@@ -9627,7 +9630,7 @@ do?
 
 
 
-
22.1.

+
22.1.

 
 
What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
@@ -9643,7 +9646,7 @@ do?
 
 
 
-
22.2.

+
22.2.

 
 
What is the difference between
 	MAKE, GMAKE and
@@ -9661,7 +9664,7 @@ do?
 
 
 
-
22.3.

+
22.3.

 
 
What is the difference between
 	CC, PKG_CC and
@@ -9679,7 +9682,7 @@ do?
 
 
 
-
22.4.

+
22.4.

 
 
What is the difference between
 	BUILDLINK_LDFLAGS,
@@ -9692,7 +9695,7 @@ do?
 
 
 
-
22.5.

+
22.5.

 
 
Why does make show-var
 	VARNAME=BUILDLINK_PREFIX.foo
@@ -9708,7 +9711,7 @@ do?
 
 
 
-
22.6.

+
22.6.

 
 
What does
 	${MASTER_SITE_SOURCEFORGE:=package/} mean? I
@@ -9732,7 +9735,7 @@ do?
 
 
 
-
22.7.

+
22.7.

 
 
Which mailing lists are there for package
 	developers?

@@ -9757,7 +9760,7 @@ do?
 
 
 
-
22.8.

+
22.8.

 
 
Where is the pkgsrc
 	documentation?

@@ -9805,7 +9808,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 3d770b8e752..9f3316ecaf8 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -376,7 +376,7 @@ II. The pkgsrc developer's guide
         21.1. Submitting binary packages
         21.2. Submitting source packages (for non-NetBSD-developers)
         21.3. General notes when adding, updating, or removing packages
-        21.4. Committing: Importing a package into CVS
+        21.4. Committing: Adding a package to CVS
         21.5. Updating a package to a newer version
         21.6. Renaming a package in pkgsrc
         21.7. Moving a package in pkgsrc
@@ -3339,7 +3339,7 @@ Table of Contents
     21.1. Submitting binary packages
     21.2. Submitting source packages (for non-NetBSD-developers)
     21.3. General notes when adding, updating, or removing packages
-    21.4. Committing: Importing a package into CVS
+    21.4. Committing: Adding a package to CVS
     21.5. Updating a package to a newer version
     21.6. Renaming a package in pkgsrc
     21.7. Moving a package in pkgsrc
@@ -7818,7 +7818,7 @@ Table of Contents
 21.1. Submitting binary packages
 21.2. Submitting source packages (for non-NetBSD-developers)
 21.3. General notes when adding, updating, or removing packages
-21.4. Committing: Importing a package into CVS
+21.4. Committing: Adding a package to CVS
 21.5. Updating a package to a newer version
 21.6. Renaming a package in pkgsrc
 21.7. Moving a package in pkgsrc
@@ -7884,27 +7884,33 @@ changes-entry-commit! If you are not using a checkout directly from
 cvs.NetBSD.org, but e.g. a local copy of the repository, you can set
 USE_NETBSD_REPO=yes. This makes the cvs commands use the main repository.
 
-21.4. Committing: Importing a package into CVS
+21.4. Committing: Adding a package to CVS
 
 This section is only of interest for pkgsrc developers with write access to the
-pkgsrc repository. Please remember that cvs imports files relative to the
-current working directory, and that the pathname that you give the cvs import
-command is so that it knows where to place the files in the repository. Newly
-created packages should be imported with a vendor tag of "TNF" and a release
-tag of "pkgsrc-base", e.g:
-
-$ cd .../pkgsrc/category/pkgname
-$ cvs import pkgsrc/category/pkgname TNF pkgsrc-base
-
-Remember to move the directory from which you imported out of the way, or cvs
-will complain the next time you "cvs update" your source tree. Also don't
-forget to add the new package to the category's Makefile.
+pkgsrc repository.
+
+When the package is finished, "cvs add" the files. Start by adding the
+directory and then files in the directory. Don't forget to add the new package
+to the category's Makefile. Make sure you don't forget any files; you can check
+by running "cvs status". An example:
+
+$ cd .../pkgsrc/category
+$ cvs add pkgname
+$ cd pkgname
+$ cvs add DESCR Makefile PLIST distinfo buildlink3.mk patches
+$ cvs add patches/p*
+$ cvs status | less
+$ cd ..
+$ vi Makefile # add SUBDIRS+=pkgname line
+$ cvs commit Makefile pkgname
 
 The commit message of the initial import should include part of the DESCR file,
 so people reading the mailing lists know what the package is/does.
 
-For new packages, "cvs import" is preferred to "cvs add" because the former
-gets everything with a single command, and provides a consistent tag.
+Also mention the new package in pkgsrc/doc/CHANGES-20xx.
+
+Previously, "cvs import" was suggested, but it was much easier to get wrong
+than "cvs add".
 
 21.5. Updating a package to a newer version
 
-- 
cgit v1.2.3