summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile-example4
-rw-r--r--doc/guide/files/components.xml5
-rw-r--r--doc/pkgsrc.html3
-rw-r--r--doc/pkgsrc.txt3
4 files changed, 3 insertions, 12 deletions
diff --git a/doc/Makefile-example b/doc/Makefile-example
index 6ba2f83e37f..09f3d9ce87e 100644
--- a/doc/Makefile-example
+++ b/doc/Makefile-example
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-example,v 1.21 2012/09/30 09:10:36 asau Exp $
+# $NetBSD: Makefile-example,v 1.22 2014/10/09 13:44:46 wiz Exp $
# First paragraph - distfile and binary package data
-# DISTNAME PKGNAME PKGREVISION SVR4_PKGNAME CATEGORIES MASTER_SITES
+# DISTNAME PKGNAME PKGREVISION CATEGORIES MASTER_SITES
# MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES
DISTNAME= make-3.80
PKGNAME= gmake-3.80 # only to be added if the package name is different from DISTNAME
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index d4f692d2fee..c2183f029ad 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.47 2014/05/09 09:58:52 wiz Exp $ -->
+<!-- $NetBSD: components.xml,v 1.48 2014/10/09 13:44:46 wiz Exp $ -->
<chapter id="components"> <?dbhtml filename="components.html"?>
<title>Package components - files, directories and contents</title>
@@ -40,14 +40,11 @@ sections.</para>
starts with a letter or digit, and contains only letters, digits,
dashes, underscores, dots and plus signs.</para></listitem>
- <listitem><para><varname>SVR4_PKGNAME</varname> is the name of
the package file to create if the <varname>PKGNAME</varname>
isn't unique on a SVR4 system. The default is
<varname>PKGNAME</varname>, which may be shortened when you use
<filename role="pkg">pkgtools/gensolpkg</filename>. Only add
- <varname>SVR4_PKGNAME</varname> if <varname>PKGNAME</varname>
does not produce an unique package name on a SVR4 system.
- The length of <varname>SVR4_PKGNAME</varname> is limited to 5
characters.</para></listitem>
<listitem><para><varname>CATEGORIES</varname> is a list of categories
diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index fc0a2c62aea..dc61710578b 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -3994,14 +3994,11 @@ sections.</p>
<code class="varname">^[A-Za-z0-9][A-Za-z0-9-_.+]*$</code>, that is, it
starts with a letter or digit, and contains only letters, digits,
dashes, underscores, dots and plus signs.</p></li>
-<li class="listitem"><p><code class="varname">SVR4_PKGNAME</code> is the name of
the package file to create if the <code class="varname">PKGNAME</code>
isn't unique on a SVR4 system. The default is
<code class="varname">PKGNAME</code>, which may be shortened when you use
<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/gensolpkg/README.html" target="_top"><code class="filename">pkgtools/gensolpkg</code></a>. Only add
- <code class="varname">SVR4_PKGNAME</code> if <code class="varname">PKGNAME</code>
does not produce an unique package name on a SVR4 system.
- The length of <code class="varname">SVR4_PKGNAME</code> is limited to 5
characters.</p></li>
<li class="listitem">
<p><code class="varname">CATEGORIES</code> is a list of categories
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index f415f8b3bd6..bb0e41bd734 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -3483,10 +3483,7 @@ mostly historical and has no further meaning.
is, it starts with a letter or digit, and contains only letters, digits,
dashes, underscores, dots and plus signs.
- * SVR4_PKGNAME is the name of the package file to create if the PKGNAME isn't
unique on a SVR4 system. The default is PKGNAME, which may be shortened
- when you use pkgtools/gensolpkg. Only add SVR4_PKGNAME if PKGNAME does not
- produce an unique package name on a SVR4 system. The length of SVR4_PKGNAME
is limited to 5 characters.
* CATEGORIES is a list of categories which the package fits in. You can