os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace usage of PORTVERSION with DISTVERSION.

Browse source 
Sponsored by:	Absolight, The FreeBSD Foundation
This commit is contained in:
Mathieu Arnold 2017-08-04 10:24:03 +00:00
parent 8b13e78c68
commit 1693955edc
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=50630
6 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
View file

@ -329,7 +329,7 @@ PORTVERSION= 1.2p4</programlisting>
<para><varname>PORTREVISION</varname> is a <para><varname>PORTREVISION</varname> is a
monotonically increasing value which is reset to 0 with monotonically increasing value which is reset to 0 with
every increase of <varname>PORTVERSION</varname>, typically every increase of <varname>DISTVERSION</varname>, typically
every time there is a new official vendor release. If every time there is a new official vendor release. If
<varname>PORTREVISION</varname> is non-zero, the value is <varname>PORTREVISION</varname> is non-zero, the value is
appended to the package name. Changes to appended to the package name. Changes to
@ -379,7 +379,7 @@ PORTVERSION= 1.2p4</programlisting>
significant functional differences. For example, significant functional differences. For example,
changes to the distfile requiring a correction to changes to the distfile requiring a correction to
<filename>distinfo</filename> with no corresponding <filename>distinfo</filename> with no corresponding
change to <varname>PORTVERSION</varname>, where a change to <varname>DISTVERSION</varname>, where a
<command>diff -ru</command> of the old and new versions <command>diff -ru</command> of the old and new versions
shows non-trivial changes to the code.</para> shows non-trivial changes to the code.</para>
</listitem> </listitem>
@ -487,7 +487,9 @@ PORTVERSION= 1.2p4</programlisting>
<para>It is expected that <varname>PORTEPOCH</varname> will <para>It is expected that <varname>PORTEPOCH</varname> will
not be used for the majority of ports, and that sensible use not be used for the majority of ports, and that sensible use
of <varname>PORTVERSION</varname> can often preempt it of <varname>DISTVERSION</varname>, or that use
<varname>PORTVERSION</varname> carefully, can often preempt
it
becoming necessary if a future release of the software becoming necessary if a future release of the software
changes the version structure. However, care is changes the version structure. However, care is
needed by &os; porters when a vendor release is made without needed by &os; porters when a vendor release is made without
@ -501,8 +503,8 @@ PORTVERSION= 1.2p4</programlisting>
<literal>20000917</literal>, and the previous version of the <literal>20000917</literal>, and the previous version of the
software was version <literal>1.2</literal>, do not use software was version <literal>1.2</literal>, do not use
<literal>20000917</literal> for <literal>20000917</literal> for
<varname>PORTVERSION</varname>. The correct way is a <varname>DISTVERSION</varname>. The correct way is a
<varname>PORTVERSION</varname> of <varname>DISTVERSION</varname> of
<literal>1.2.20000917</literal>, or similar, so that the <literal>1.2.20000917</literal>, or similar, so that the
succeeding release, say <literal>1.3</literal>, is still a succeeding release, say <literal>1.3</literal>, is still a
numerically greater value.</para> numerically greater value.</para>
@ -517,7 +519,7 @@ PORTVERSION= 1.2p4</programlisting>
collection:</para> collection:</para>
<programlisting>PORTNAME= gtkmumble <programlisting>PORTNAME= gtkmumble
PORTVERSION= 0.10</programlisting> DISTVERSION= 0.10</programlisting>
<para><varname>PKGNAME</varname> becomes <para><varname>PKGNAME</varname> becomes
<literal>gtkmumble-0.10</literal>.</para> <literal>gtkmumble-0.10</literal>.</para>
@ -527,7 +529,7 @@ PORTVERSION= 0.10</programlisting>
accordingly.</para> accordingly.</para>
<programlisting>PORTNAME= gtkmumble <programlisting>PORTNAME= gtkmumble
PORTVERSION= 0.10 DISTVERSION= 0.10
PORTREVISION= 1</programlisting> PORTREVISION= 1</programlisting>
<para><varname>PKGNAME</varname> becomes <para><varname>PKGNAME</varname> becomes
@ -547,7 +549,7 @@ PORTREVISION= 1</programlisting>
removed from the <filename>Makefile</filename>).</para> removed from the <filename>Makefile</filename>).</para>
<programlisting>PORTNAME= gtkmumble <programlisting>PORTNAME= gtkmumble
PORTVERSION= 0.2 DISTVERSION= 0.2
PORTEPOCH= 1</programlisting> PORTEPOCH= 1</programlisting>
<para><varname>PKGNAME</varname> becomes <para><varname>PKGNAME</varname> becomes
@ -558,7 +560,7 @@ PORTEPOCH= 1</programlisting>
variables are now:</para> variables are now:</para>
<programlisting>PORTNAME= gtkmumble <programlisting>PORTNAME= gtkmumble
PORTVERSION= 0.3 DISTVERSION= 0.3
PORTEPOCH= 1</programlisting> PORTEPOCH= 1</programlisting>
<para><varname>PKGNAME</varname> becomes <para><varname>PKGNAME</varname> becomes
@ -649,7 +651,7 @@ PORTEPOCH= 1</programlisting>
<para>Make sure that the port's name and version are <para>Make sure that the port's name and version are
clearly separated and placed into clearly separated and placed into
<varname>PORTNAME</varname> and <varname>PORTNAME</varname> and
<varname>PORTVERSION</varname>. The only <varname>DISTVERSION</varname>. The only
reason for <varname>PORTNAME</varname> to contain a reason for <varname>PORTNAME</varname> to contain a
version part is if the upstream distribution is really version part is if the upstream distribution is really
named that way, as in the named that way, as in the
@ -1807,7 +1809,7 @@ PORTEPOCH= 1</programlisting>
called by the authors of the software. called by the authors of the software.
<varname>DISTNAME</varname> defaults to <varname>DISTNAME</varname> defaults to
<literal>${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}</literal>, <literal>${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}</literal>,
and <varname>DISTVERSION</varname> defaults to and if not set, <varname>DISTVERSION</varname> defaults to
<literal>${PORTVERSION}</literal> so override <literal>${PORTVERSION}</literal> so override
<varname>DISTNAME</varname> <varname>DISTNAME</varname>
only if necessary. <varname>DISTNAME</varname> is only used only if necessary. <varname>DISTNAME</varname> is only used
@ -2419,7 +2421,7 @@ MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
this (slightly stripped for the example):</para> this (slightly stripped for the example):</para>
<programlisting>PORTNAME= pkg <programlisting>PORTNAME= pkg
PORTVERSION= 1.2.7 DISTVERSION= 1.2.7
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= freebsd</programlisting> GH_ACCOUNT= freebsd</programlisting>
@ -2442,7 +2444,7 @@ GH_ACCOUNT= freebsd</programlisting>
this (slightly stripped for the example):</para> this (slightly stripped for the example):</para>
<programlisting>PORTNAME= pkg-devel <programlisting>PORTNAME= pkg-devel
PORTVERSION= 1.3.0.a.20140411 DISTVERSION= 1.3.0.a.20140411
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= freebsd GH_ACCOUNT= freebsd
@ -2467,8 +2469,8 @@ GH_TAGNAME= 6dbb17b</programlisting>
<varname>DISTVERSIONSUFFIX</varname>:</para> <varname>DISTVERSIONSUFFIX</varname>:</para>
<programlisting>PORTNAME= foo <programlisting>PORTNAME= foo
PORTVERSION= 1.0.2
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.0.2
USE_GITHUB= yes</programlisting> USE_GITHUB= yes</programlisting>
@ -2548,7 +2550,7 @@ USE_GITHUB= yes</programlisting>
variables:</para> variables:</para>
<programlisting>PORTNAME= foo <programlisting>PORTNAME= foo
PORTVERSION= 1.0.2 DISTVERSION= 1.0.2
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= bar:icons,contrib GH_ACCOUNT= bar:icons,contrib
@ -2608,7 +2610,7 @@ CONFIGURE_ARGS= --with-contrib=${WRKSRC_contrib}</programlisting>
using <varname>GH_TUPLE</varname>:</para> using <varname>GH_TUPLE</varname>:</para>
<programlisting>PORTNAME= foo <programlisting>PORTNAME= foo
PORTVERSION= 1.0.2 DISTVERSION= 1.0.2
USE_GITHUB= yes USE_GITHUB= yes
GH_TUPLE= bar:foo-icons:1.0:icons/ext/icons \ GH_TUPLE= bar:foo-icons:1.0:icons/ext/icons \
@ -2713,8 +2715,8 @@ Submodule path 'lib/wxsqlite3': checked out 'fb66eb230d8aed21dec273b38c7c054dcb7
(only GitHub-related lines are shown):</para> (only GitHub-related lines are shown):</para>
<programlisting>PORTNAME= moneymanagerex <programlisting>PORTNAME= moneymanagerex
PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.3.0
USE_GITHUB= yes USE_GITHUB= yes
GH_TUPLE= utelle:wxsqlite3:v3.4.0:wxsqlite3/lib/wxsqlite3 \ GH_TUPLE= utelle:wxsqlite3:v3.4.0:wxsqlite3/lib/wxsqlite3 \
@ -5466,7 +5468,7 @@ BAR_LIB_DEPENDS= libbar.so:foo/bar</programlisting>
of <filename>japanese/xdvi300/Makefile</filename>;</para> of <filename>japanese/xdvi300/Makefile</filename>;</para>
<programlisting>PORTNAME= xdvi <programlisting>PORTNAME= xdvi
PORTVERSION= 17 DISTVERSION= 17
PKGNAMEPREFIX= ja- PKGNAMEPREFIX= ja-
PKGNAMESUFFIX= ${RESOLUTION} PKGNAMESUFFIX= ${RESOLUTION}
@ -6915,7 +6917,7 @@ post-patch:
<filename>Makefile</filename> has:</para> <filename>Makefile</filename> has:</para>
<programlisting>PORTNAME= foo <programlisting>PORTNAME= foo
PORTVERSION= 1.0</programlisting> DISTVERSION= 1.0</programlisting>
<para>then the port's distribution files contain a top-level <para>then the port's distribution files contain a top-level
directory, <filename>foo-1.0</filename>, and the rest of the directory, <filename>foo-1.0</filename>, and the rest of the

2
en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
View file

@ -318,7 +318,7 @@ PLIST_SUB+= X11I386="@comment "
<filename>Makefile</filename>:</para> <filename>Makefile</filename>:</para>
<programlisting>PORTNAME= Machine-Build <programlisting>PORTNAME= Machine-Build
PORTVERSION= 1 DISTVERSION= 1
CATEGORIES= devel perl5 CATEGORIES= devel perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-

12
en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
View file

@ -29,13 +29,13 @@ when it is committed to our repository. If upgrading a port, do not alter
this line back to "&dollar;FreeBSD&dollar;". SVN deals with it automatically.] this line back to "&dollar;FreeBSD&dollar;". SVN deals with it automatically.]
[section to describe the port itself and the master site - PORTNAME [section to describe the port itself and the master site - PORTNAME
and PORTVERSION are always first, followed by CATEGORIES, and PORTVERSION or the DISTVERSION* variables are always first,
and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR. followed by CATEGORIES, and then MASTER_SITES, which can be followed
PKGNAMEPREFIX and PKGNAMESUFFIX, if needed, will be after that. by MASTER_SITE_SUBDIR. PKGNAMEPREFIX and PKGNAMESUFFIX, if needed,
Then comes DISTNAME, EXTRACT_SUFX and/or DISTFILES, and then will be after that. Then comes DISTNAME, EXTRACT_SUFX and/or
EXTRACT_ONLY, as necessary.] DISTFILES, and then EXTRACT_ONLY, as necessary.]
PORTNAME= xdvi PORTNAME= xdvi
PORTVERSION= 18.2 DISTVERSION= 18.2
CATEGORIES= print CATEGORIES= print
[do not forget the trailing slash ("/")! [do not forget the trailing slash ("/")!
if not using MASTER_SITE_* macros] if not using MASTER_SITE_* macros]

2
en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
View file

@ -48,7 +48,7 @@
<programlisting># &dollar;FreeBSD&dollar; <programlisting># &dollar;FreeBSD&dollar;
PORTNAME= oneko PORTNAME= oneko
PORTVERSION= 1.1b DISTVERSION= 1.1b
CATEGORIES= games CATEGORIES= games
MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/ MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/

4
en_US.ISO8859-1/books/porters-handbook/security/chapter.xml
View file

@ -76,12 +76,12 @@
to run an update. Besides, a new package will be built and to run an update. Besides, a new package will be built and
distributed over FTP and WWW mirrors, replacing the vulnerable distributed over FTP and WWW mirrors, replacing the vulnerable
one. Bump <varname>PORTREVISION</varname> unless one. Bump <varname>PORTREVISION</varname> unless
<varname>PORTVERSION</varname> has changed in the course of <varname>DISTVERSION</varname> has changed in the course of
correcting the vulnerability. That is, bump correcting the vulnerability. That is, bump
<varname>PORTREVISION</varname> if adding a patch file <varname>PORTREVISION</varname> if adding a patch file
to the port, but do not bump it if updating the port to to the port, but do not bump it if updating the port to
the latest software version and thus already touched the latest software version and thus already touched
<varname>PORTVERSION</varname>. Please refer to the <varname>DISTVERSION</varname>. Please refer to the
<link linkend="makefile-naming-revepoch">corresponding <link linkend="makefile-naming-revepoch">corresponding
section</link> for more information.</para> section</link> for more information.</para>
</sect1> </sect1>

8
en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
View file

@ -1498,7 +1498,7 @@ USE_XORG= x11 xpm</programlisting>
<programlisting># &dollar;FreeBSD&dollar; <programlisting># &dollar;FreeBSD&dollar;
PORTNAME= regexxer PORTNAME= regexxer
PORTVERSION= 0.10 DISTVERSION= 0.10
CATEGORIES= devel textproc gnome CATEGORIES= devel textproc gnome
MASTER_SITES= GNOME MASTER_SITES= GNOME
@ -3563,7 +3563,7 @@ do-install:
<title>Example Makefile for PEAR Class</title> <title>Example Makefile for PEAR Class</title>
<programlisting>PORTNAME= Date <programlisting>PORTNAME= Date
PORTVERSION= 1.4.3 DISTVERSION= 1.4.3
CATEGORIES= devel www pear CATEGORIES= devel www pear
MAINTAINER= example@domain.com MAINTAINER= example@domain.com
@ -3598,7 +3598,7 @@ USES= pear
Module</title> Module</title>
<programlisting>PORTNAME= Horde_Core <programlisting>PORTNAME= Horde_Core
PORTVERSION= 2.14.0 DISTVERSION= 2.14.0
CATEGORIES= devel www pear CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org MAINTAINER= horde@FreeBSD.org
@ -3751,7 +3751,7 @@ SOCKETS_USE= PHP=sockets
Module</title> Module</title>
<programlisting>PORTNAME= sample <programlisting>PORTNAME= sample
PORTVERSION= 1.2.3 DISTVERSION= 1.2.3
CATEGORIES= devel CATEGORIES= devel
MAINTAINER= john@doe.tld MAINTAINER= john@doe.tld