From 40bc38606a68339553371b12abd10eda68a620e1 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Wed, 21 Aug 2013 10:11:44 +0000 Subject: [PATCH] Regenerate text and HTML versions after my recent changes. --- doc/pkgsrc.html | 80 ++++++++++++++++++++++++++++++++----------------- doc/pkgsrc.txt | 48 +++++++++++++++++++++-------- 2 files changed, 88 insertions(+), 40 deletions(-) diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index 0527b0c9e65a..48f404af20c9 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -85,8 +85,9 @@
3.3.4. Interix
3.3.5. IRIX
3.3.6. Linux
-
3.3.7. OpenBSD
-
3.3.8. Solaris
+
3.3.7. MirBSD
+
3.3.8. OpenBSD
+
3.3.9. Solaris
4. Using pkgsrc
@@ -668,7 +669,7 @@ minutes!

MirBSD -Aug 2011 +Jan 2011 Minix3 @@ -820,8 +821,9 @@ minutes!

3.3.4. Interix
3.3.5. IRIX
3.3.6. Linux
-
3.3.7. OpenBSD
-
3.3.8. Solaris
+
3.3.7. MirBSD
+
3.3.8. OpenBSD
+
3.3.9. Solaris
4. Using pkgsrc
@@ -1119,8 +1121,9 @@ release -d
3.3.4. Interix
3.3.5. IRIX
3.3.6. Linux
-
3.3.7. OpenBSD
-
3.3.8. Solaris
+
3.3.7. MirBSD
+
3.3.8. OpenBSD
+
3.3.9. Solaris
@@ -1513,7 +1516,30 @@ ICCBASE= /opt/intel/cc/10.1.008

-3.3.7. OpenBSD

+3.3.7. MirBSD
+

pkgsrc has been tested on MirBSD #10-current (2011 and newer). + Older versions might also work. Releases before #10 are not + supported.

+

The package tools of the (older) native ports tree, + MirPorts, + have the same names as the ones used by pkgsrc. Care should be taken + that the right tools are used. When installing packages from source, + use the bmake command for pkgsrc and + mmake for MirPorts.

+

pkgsrc and MirPorts use the same location for the package + database, /var/db/pkg. It is strongly recommended + to use /usr/pkg/db instead, so that the pkgsrc + tree is self-contained. This is also the default setting used in the + binary package builds.

+

Binary packages for MirBSD/i386 can be found on the pkgsrc ftp + server. The bootstrap kit there already contains the + pkgin package manager. See the + pkgsrc on MirOS + page for more details.

+ +
+

+3.3.8. OpenBSD

OpenBSD 5.1 has been tested and supported, other versions may work.

Care should be taken so that the tools that this kit installs do not conflict @@ -1554,7 +1580,7 @@ ICCBASE= /opt/intel/cc/10.1.008

-3.3.8. Solaris

+3.3.9. Solaris

Solaris 2.6 through 10 are supported on both x86 and sparc. You will need a working C compiler. Both gcc 4.5.3 and Sun WorkShop 5 have been tested.

@@ -1575,7 +1601,7 @@ ICCBASE= /opt/intel/cc/10.1.008 and e.g. /usr/pkg/{bin,sbin}.

-3.3.8.1. If you are using gcc

+3.3.9.1. If you are using gcc

It makes life much simpler if you only use the same gcc consistently for building all packages.

It is recommended that an external gcc be used only for bootstrapping, @@ -1586,7 +1612,7 @@ ICCBASE= /opt/intel/cc/10.1.008

-3.3.8.2. If you are using Sun WorkShop

+3.3.9.2. If you are using Sun WorkShop

You will need at least the following packages installed (from WorkShop 5.0)

-3.3.8.3. Building 64-bit binaries with SunPro

+3.3.9.3. Building 64-bit binaries with SunPro

To build 64-bit packages, you just need to have the following lines in your mk.conf file:

@@ -1632,7 +1658,7 @@ ABI=                    64
 
 

 

-3.3.8.4. Common problems

+3.3.9.4. Common problems

 
Sometimes, when using libtool,
       /bin/ksh crashes with a segmentation fault.
       The workaround is to use another shell for the configure
@@ -7666,7 +7692,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
@@ -7685,7 +7711,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 
 
 
-
18.4.1.

+
18.4.1.

 
 
How do I add a new tool?

 
@@ -7695,7 +7721,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 
 
 
-
18.4.2.

+
18.4.2.

 
 
How do I get a list of all available
 	tools?

@@ -7706,7 +7732,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
@@ -9769,7 +9795,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?
@@ -9814,7 +9840,7 @@ do?
 
 
 
-
22.1.

+
22.1.

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

+
22.2.

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

+
22.3.

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

+
22.4.

 
 
What is the difference between
 	BUILDLINK_LDFLAGS,
@@ -9879,7 +9905,7 @@ do?
 
 
 
-
22.5.

+
22.5.

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

+
22.6.

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

+
22.7.

 
 
Which mailing lists are there for package
 	developers?

@@ -9944,7 +9970,7 @@ do?
 
 
 
-
22.8.

+
22.8.

 
 
Where is the pkgsrc
 	documentation?

@@ -9992,7 +10018,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 3c67ceb247a0..a9719199d3dd 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -67,8 +67,9 @@ I. The pkgsrc user's guide
             3.3.4. Interix
             3.3.5. IRIX
             3.3.6. Linux
-            3.3.7. OpenBSD
-            3.3.8. Solaris
+            3.3.7. MirBSD
+            3.3.8. OpenBSD
+            3.3.9. Solaris
 
     4. Using pkgsrc
 
@@ -590,7 +591,7 @@ Table 1.1. Platforms supported by pkgsrc
 |---------------------------------------------+------------------|
 |Haiku                                        |     Sep 2010     |
 |---------------------------------------------+------------------|
-|MirBSD                                       |     Aug 2011     |
+|MirBSD                                       |     Jan 2011     |
 |---------------------------------------------+------------------|
 |Minix3                                       |     Nov 2011     |
 |---------------------------------------------+------------------|
@@ -719,8 +720,9 @@ Table of Contents
         3.3.4. Interix
         3.3.5. IRIX
         3.3.6. Linux
-        3.3.7. OpenBSD
-        3.3.8. Solaris
+        3.3.7. MirBSD
+        3.3.8. OpenBSD
+        3.3.9. Solaris
 
 4. Using pkgsrc
 
@@ -1001,8 +1003,9 @@ Table of Contents
     3.3.4. Interix
     3.3.5. IRIX
     3.3.6. Linux
-    3.3.7. OpenBSD
-    3.3.8. Solaris
+    3.3.7. MirBSD
+    3.3.8. OpenBSD
+    3.3.9. Solaris
 
 3.1. Binary distribution
 
@@ -1359,7 +1362,26 @@ linking a C++ shared library and records it, throwing away the -Bstatic and
 libtool-linked C++ shared libraries will have a runtime dependency on the icc
 libraries until this is fixed in libtool.
 
-3.3.7. OpenBSD
+3.3.7. MirBSD
+
+pkgsrc has been tested on MirBSD #10-current (2011 and newer). Older versions
+might also work. Releases before #10 are not supported.
+
+The package tools of the (older) native ports tree, MirPorts, have the same
+names as the ones used by pkgsrc. Care should be taken that the right tools are
+used. When installing packages from source, use the bmake command for pkgsrc
+and mmake for MirPorts.
+
+pkgsrc and MirPorts use the same location for the package database, /var/db/
+pkg. It is strongly recommended to use /usr/pkg/db instead, so that the pkgsrc
+tree is self-contained. This is also the default setting used in the binary
+package builds.
+
+Binary packages for MirBSD/i386 can be found on the pkgsrc ftp server. The
+bootstrap kit there already contains the pkgin package manager. See the pkgsrc
+on MirOS page for more details.
+
+3.3.8. OpenBSD
 
 OpenBSD 5.1 has been tested and supported, other versions may work.
 
@@ -1392,7 +1414,7 @@ with the OpenBSD userland tools. There are several steps:
     .endif
 
 
-3.3.8. Solaris
+3.3.9. Solaris
 
 Solaris 2.6 through 10 are supported on both x86 and sparc. You will need a
 working C compiler. Both gcc 4.5.3 and Sun WorkShop 5 have been tested.
@@ -1417,7 +1439,7 @@ Whichever compiler you use, please ensure the compiler tools and your $prefix
 are in your PATH. This includes /usr/ccs/{bin,lib} and e.g. /usr/pkg/
 {bin,sbin}.
 
-3.3.8.1. If you are using gcc
+3.3.9.1. If you are using gcc
 
 It makes life much simpler if you only use the same gcc consistently for
 building all packages.
@@ -1428,7 +1450,7 @@ gcc used during bootstrapping.
 
 Binary packages of gcc can be found through http://www.sunfreeware.com/.
 
-3.3.8.2. If you are using Sun WorkShop
+3.3.9.2. If you are using Sun WorkShop
 
 You will need at least the following packages installed (from WorkShop 5.0)
 
@@ -1452,7 +1474,7 @@ Note
 The CPP setting might break some packages that use the C preprocessor for
 processing things other than C source code.
 
-3.3.8.3. Building 64-bit binaries with SunPro
+3.3.9.3. Building 64-bit binaries with SunPro
 
 To build 64-bit packages, you just need to have the following lines in your
 mk.conf file:
@@ -1465,7 +1487,7 @@ Note
 This setting has been tested for the SPARC architecture. Intel and AMD machines
 need some more work.
 
-3.3.8.4. Common problems
+3.3.9.4. Common problems
 
 Sometimes, when using libtool, /bin/ksh crashes with a segmentation fault. The
 workaround is to use another shell for the configure scripts, for example by