From owner-svn-doc-all@freebsd.org Fri Aug 4 10:24:02 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 26AA9DD1D2A; Fri, 4 Aug 2017 10:24:02 +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 018E0333E; Fri, 4 Aug 2017 10:24:01 +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 v74AO1V8068796; Fri, 4 Aug 2017 10:24:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v74AO1Ll068795; Fri, 4 Aug 2017 10:24:01 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708041024.v74AO1Ll068795@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:00 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50629 - head/en_US.ISO8859-1/books/porters-handbook/makefiles X-SVN-Group: doc-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/makefiles X-SVN-Commit-Revision: 50629 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:02 -0000 Author: mat Date: Fri Aug 4 10:24:00 2017 New Revision: 50629 URL: https://svnweb.freebsd.org/changeset/doc/50629 Log: Fix the "Package Naming Examples" table. It was badly outdated. Sponsored by: Absolight, The FreeBSD Foundation Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/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:23:58 2017 (r50628) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Aug 4 10:24:00 2017 (r50629) @@ -740,8 +740,11 @@ PORTEPOCH= 1 Here are some (real) examples on how to convert the name - as called by the software authors to a suitable package - name: + as called by the software authors to a suitable package name, + for each line, only one of DISTVERSION or + PORTVERSION is set in, depending on which + would be used in the port's + Makefile: Package Naming Examples @@ -753,8 +756,9 @@ PORTEPOCH= 1PKGNAMEPREFIXPORTNAMEPKGNAMESUFFIX + DISTVERSIONPORTVERSION - Reason + Reason or comment @@ -765,6 +769,7 @@ PORTEPOCH= 1mule(empty)2.2.2 + No changes required @@ -774,7 +779,10 @@ PORTEPOCH= 1mule11.0.1 - mule already exists + + This is version 1 of + mule, and version 2 already + exists @@ -783,6 +791,7 @@ PORTEPOCH= 1 emiclock (empty) 1.0.2 + No uppercase names for single programs @@ -791,9 +800,9 @@ PORTEPOCH= 1(empty)rdist(empty) - 1.3.a - No strings like alpha - allowed + 1.3alpha + + Version will be 1.3.a @@ -801,9 +810,9 @@ PORTEPOCH= 1 (empty) es (empty) - 0.9.b1 - No strings like beta - allowed + 0.9-beta1 + + Version will be 0.9.b1 @@ -811,9 +820,9 @@ PORTEPOCH= 1 (empty) mailman (empty) - 2.0.r3 - No strings like rc - allowed + 2.0rc3 + + Version will be 2.0.r3 @@ -821,6 +830,7 @@ PORTEPOCH= 1 (empty) tiff (empty) + 3.3 What the heck was that anyway? @@ -830,8 +840,10 @@ PORTEPOCH= 1(empty)tvtwm(empty) - pl11 - Version string always required + + p11 + No version in the filename, use what upstream + says it is @@ -840,7 +852,9 @@ PORTEPOCH= 1 piewm (empty) 1.0 - Version string always required + + No version in the filename, use what upstream + says it is @@ -848,9 +862,10 @@ PORTEPOCH= 1 (empty) xvgr (empty) - 2.10.1 - pl allowed only when no - major/minor version numbers + + 2.10.pl1 + In that case, pl1 means patch + level, so using DISTVERSION is not possible. @@ -859,6 +874,7 @@ PORTEPOCH= 1 gawk (empty) 2.15.6 + Japanese language version @@ -868,6 +884,7 @@ PORTEPOCH= 1psutils-letter1.13 + Paper size hardcoded at package build time @@ -878,6 +895,7 @@ PORTEPOCH= 1pkfonts3001.0 + Package for 300dpi fonts