From owner-svn-doc-all@freebsd.org Fri Aug 4 10:24:05 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8450ADD1D5D; Fri, 4 Aug 2017 10:24:05 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 619523378; Fri, 4 Aug 2017 10:24:05 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v74AO4jM068843; Fri, 4 Aug 2017 10:24:04 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v74AO4VV068837; Fri, 4 Aug 2017 10:24:04 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708041024.v74AO4VV068837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 4 Aug 2017 10:24:04 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50630 - in head/en_US.ISO8859-1/books/porters-handbook: makefiles plist porting-samplem quick-porting security special X-SVN-Group: doc-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/en_US.ISO8859-1/books/porters-handbook: makefiles plist porting-samplem quick-porting security special X-SVN-Commit-Revision: 50630 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2017 10:24:05 -0000 Author: mat Date: Fri Aug 4 10:24:03 2017 New Revision: 50630 URL: https://svnweb.freebsd.org/changeset/doc/50630 Log: Replace usage of PORTVERSION with DISTVERSION. Sponsored by: Absolight, The FreeBSD Foundation Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -329,7 +329,7 @@ PORTVERSION= 1.2p4 PORTREVISION is a monotonically increasing value which is reset to 0 with - every increase of PORTVERSION, typically + every increase of DISTVERSION, typically every time there is a new official vendor release. If PORTREVISION is non-zero, the value is appended to the package name. Changes to @@ -379,7 +379,7 @@ PORTVERSION= 1.2p4 significant functional differences. For example, changes to the distfile requiring a correction to distinfo with no corresponding - change to PORTVERSION, where a + change to DISTVERSION, where a diff -ru of the old and new versions shows non-trivial changes to the code. @@ -487,7 +487,9 @@ PORTVERSION= 1.2p4 It is expected that PORTEPOCH will not be used for the majority of ports, and that sensible use - of PORTVERSION can often preempt it + of DISTVERSION, or that use + PORTVERSION carefully, can often preempt + it becoming necessary if a future release of the software changes the version structure. However, care is needed by &os; porters when a vendor release is made without @@ -501,8 +503,8 @@ PORTVERSION= 1.2p4 20000917, and the previous version of the software was version 1.2, do not use 20000917 for - PORTVERSION. The correct way is a - PORTVERSION of + DISTVERSION. The correct way is a + DISTVERSION of 1.2.20000917, or similar, so that the succeeding release, say 1.3, is still a numerically greater value. @@ -517,7 +519,7 @@ PORTVERSION= 1.2p4 collection: PORTNAME= gtkmumble -PORTVERSION= 0.10 +DISTVERSION= 0.10 PKGNAME becomes gtkmumble-0.10. @@ -527,7 +529,7 @@ PORTVERSION= 0.10 accordingly. PORTNAME= gtkmumble -PORTVERSION= 0.10 +DISTVERSION= 0.10 PORTREVISION= 1 PKGNAME becomes @@ -547,7 +549,7 @@ PORTREVISION= 1 removed from the Makefile). PORTNAME= gtkmumble -PORTVERSION= 0.2 +DISTVERSION= 0.2 PORTEPOCH= 1 PKGNAME becomes @@ -558,7 +560,7 @@ PORTEPOCH= 1 variables are now: PORTNAME= gtkmumble -PORTVERSION= 0.3 +DISTVERSION= 0.3 PORTEPOCH= 1 PKGNAME becomes @@ -649,7 +651,7 @@ PORTEPOCH= 1 Make sure that the port's name and version are clearly separated and placed into PORTNAME and - PORTVERSION. The only + DISTVERSION. The only reason for PORTNAME to contain a version part is if the upstream distribution is really named that way, as in the @@ -1807,7 +1809,7 @@ PORTEPOCH= 1 called by the authors of the software. DISTNAME defaults to ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}, - and DISTVERSION defaults to + and if not set, DISTVERSION defaults to ${PORTVERSION} so override DISTNAME only if necessary. DISTNAME is only used @@ -2419,7 +2421,7 @@ MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${POR this (slightly stripped for the example): PORTNAME= pkg -PORTVERSION= 1.2.7 +DISTVERSION= 1.2.7 USE_GITHUB= yes GH_ACCOUNT= freebsd @@ -2442,7 +2444,7 @@ GH_ACCOUNT= freebsd this (slightly stripped for the example): PORTNAME= pkg-devel -PORTVERSION= 1.3.0.a.20140411 +DISTVERSION= 1.3.0.a.20140411 USE_GITHUB= yes GH_ACCOUNT= freebsd @@ -2467,8 +2469,8 @@ GH_TAGNAME= 6dbb17b DISTVERSIONSUFFIX: PORTNAME= foo -PORTVERSION= 1.0.2 DISTVERSIONPREFIX= v +DISTVERSION= 1.0.2 USE_GITHUB= yes @@ -2548,7 +2550,7 @@ USE_GITHUB= yes variables: PORTNAME= foo -PORTVERSION= 1.0.2 +DISTVERSION= 1.0.2 USE_GITHUB= yes GH_ACCOUNT= bar:icons,contrib @@ -2608,7 +2610,7 @@ CONFIGURE_ARGS= --with-contrib=${WRKSRC_contrib}GH_TUPLE: PORTNAME= foo -PORTVERSION= 1.0.2 +DISTVERSION= 1.0.2 USE_GITHUB= yes GH_TUPLE= bar:foo-icons:1.0:icons/ext/icons \ @@ -2713,8 +2715,8 @@ Submodule path 'lib/wxsqlite3': checked out 'fb66eb230 (only GitHub-related lines are shown): PORTNAME= moneymanagerex -PORTVERSION= 1.3.0 DISTVERSIONPREFIX= v +DISTVERSION= 1.3.0 USE_GITHUB= yes GH_TUPLE= utelle:wxsqlite3:v3.4.0:wxsqlite3/lib/wxsqlite3 \ @@ -5466,7 +5468,7 @@ BAR_LIB_DEPENDS= libbar.so:foo/bar of japanese/xdvi300/Makefile; PORTNAME= xdvi -PORTVERSION= 17 +DISTVERSION= 17 PKGNAMEPREFIX= ja- PKGNAMESUFFIX= ${RESOLUTION} @@ -6915,7 +6917,7 @@ post-patch: Makefile has: PORTNAME= foo -PORTVERSION= 1.0 +DISTVERSION= 1.0 then the port's distribution files contain a top-level directory, foo-1.0, and the rest of the Modified: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -318,7 +318,7 @@ PLIST_SUB+= X11I386="@comment " Makefile: PORTNAME= Machine-Build -PORTVERSION= 1 +DISTVERSION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -29,13 +29,13 @@ when it is committed to our repository. If upgrading this line back to "$FreeBSD$". SVN deals with it automatically.] [section to describe the port itself and the master site - PORTNAME - and PORTVERSION are always first, followed by CATEGORIES, - and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR. - PKGNAMEPREFIX and PKGNAMESUFFIX, if needed, will be after that. - Then comes DISTNAME, EXTRACT_SUFX and/or DISTFILES, and then - EXTRACT_ONLY, as necessary.] + and PORTVERSION or the DISTVERSION* variables are always first, + followed by CATEGORIES, and then MASTER_SITES, which can be followed + by MASTER_SITE_SUBDIR. PKGNAMEPREFIX and PKGNAMESUFFIX, if needed, + will be after that. Then comes DISTNAME, EXTRACT_SUFX and/or + DISTFILES, and then EXTRACT_ONLY, as necessary.] PORTNAME= xdvi -PORTVERSION= 18.2 +DISTVERSION= 18.2 CATEGORIES= print [do not forget the trailing slash ("/")! if not using MASTER_SITE_* macros] Modified: head/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -48,7 +48,7 @@ # $FreeBSD$ PORTNAME= oneko -PORTVERSION= 1.1b +DISTVERSION= 1.1b CATEGORIES= games MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/ Modified: head/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -76,12 +76,12 @@ to run an update. Besides, a new package will be built and distributed over FTP and WWW mirrors, replacing the vulnerable one. Bump PORTREVISION unless - PORTVERSION has changed in the course of + DISTVERSION has changed in the course of correcting the vulnerability. That is, bump PORTREVISION if adding a patch file to the port, but do not bump it if updating the port to the latest software version and thus already touched - PORTVERSION. Please refer to the + DISTVERSION. Please refer to the corresponding section for more information. Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Aug 4 10:24:03 2017 (r50630) @@ -1498,7 +1498,7 @@ USE_XORG= x11 xpm # $FreeBSD$ PORTNAME= regexxer -PORTVERSION= 0.10 +DISTVERSION= 0.10 CATEGORIES= devel textproc gnome MASTER_SITES= GNOME @@ -3563,7 +3563,7 @@ do-install: Example Makefile for PEAR Class PORTNAME= Date -PORTVERSION= 1.4.3 +DISTVERSION= 1.4.3 CATEGORIES= devel www pear MAINTAINER= example@domain.com @@ -3598,7 +3598,7 @@ USES= pear Module PORTNAME= Horde_Core -PORTVERSION= 2.14.0 +DISTVERSION= 2.14.0 CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org @@ -3751,7 +3751,7 @@ SOCKETS_USE= PHP=sockets Module PORTNAME= sample -PORTVERSION= 1.2.3 +DISTVERSION= 1.2.3 CATEGORIES= devel MAINTAINER= john@doe.tld