From owner-svn-doc-all@freebsd.org Thu Aug 17 10:42:13 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 DC208DDA60C; Thu, 17 Aug 2017 10:42:13 +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 B223A6BC49; Thu, 17 Aug 2017 10:42:13 +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 v7HAgCgb069031; Thu, 17 Aug 2017 10:42:12 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7HAgCuH069028; Thu, 17 Aug 2017 10:42:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708171042.v7HAgCuH069028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 17 Aug 2017 10:42:12 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50682 - in head: en_US.ISO8859-1/books/porters-handbook/makefiles share/xml X-SVN-Group: doc-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head: en_US.ISO8859-1/books/porters-handbook/makefiles share/xml X-SVN-Commit-Revision: 50682 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: Thu, 17 Aug 2017 10:42:14 -0000 Author: mat Date: Thu Aug 17 10:42:12 2017 New Revision: 50682 URL: https://svnweb.freebsd.org/changeset/doc/50682 Log: Add a USE_GITHUB example on how to use git describe. Reviewed by: bcr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D12047 Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml head/share/xml/man-refs.ent Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Thu Aug 17 08:07:42 2017 (r50681) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Thu Aug 17 10:42:12 2017 (r50682) @@ -2549,6 +2549,86 @@ GH_TAGNAME= c472d66b future. + + Using <varname>USE_GITHUB</varname> to Access + a Commit Between Two Versions + + If the current version of the software uses a + Git tag, and the port needs to be + updated to a newer, intermediate version, without a tag, use + &man.git-describe.1; to find out the version to use: + + &prompt.user; git describe --tags f0038b1 +v0.7.3-14-gf0038b1 + + v0.7.3-14-gf0038b1 can be split into + three parts: + + + + v0.7.3 + + + This is the last Git + tag that appears in the commit history before the + requested commit. + + + + + -14 + + + This means that the requested commit, + f0038b1, is the 14th commit after + the v0.7.3 tag. + + + + + -gf0038b1 + + + The -g means + Git, and + the f0038b1 is the commit hash + that this reference points to. + + + + + PORTNAME= bar +DISTVERSIONPREFIX= v +DISTVERSION= 0.7.3-14 +DISTVERSIONSUFFIX= -gf0038b1 + +USE_GITHUB= yes + + This creates a versioning scheme that increases over + time (well, over commits), and does not conflict with the + creation of a 0.7.4 version. + (See for + details on &man.pkg-version.8;): + + &prompt.user; pkg version -t 0.7.3 0.7.3.14 +< +&prompt.user; pkg version -t 0.7.3.14 0.7.4 +< + + + If the requested commit is the same as a tag, a + shorter description is shown by default. The longer + version is equivalent: + + &prompt.user; git describe --tags c66c71d +v0.7.3 +&prompt.user; git describe --tags --long c66c71d +v0.7.3-0-gc66c71d + + + + + Fetching Multiple Files from GitHub Modified: head/share/xml/man-refs.ent ============================================================================== --- head/share/xml/man-refs.ent Thu Aug 17 08:07:42 2017 (r50681) +++ head/share/xml/man-refs.ent Thu Aug 17 10:42:12 2017 (r50682) @@ -270,6 +270,7 @@ getfacl1"> getopt1"> getopts1"> +git-describe1"> git-submodule1"> glob1"> gnu-ar1">