From owner-svn-doc-all@freebsd.org Sun Nov 27 12:40:14 2016 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 67D11C57D73; Sun, 27 Nov 2016 12:40:14 +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 288B3A06; Sun, 27 Nov 2016 12:40:14 +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 uARCeDlq080867; Sun, 27 Nov 2016 12:40:13 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uARCeDJV080866; Sun, 27 Nov 2016 12:40:13 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201611271240.uARCeDJV080866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sun, 27 Nov 2016 12:40:13 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r49702 - head/en_US.ISO8859-1/books/porters-handbook/makefiles X-SVN-Group: doc-head 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: Sun, 27 Nov 2016 12:40:14 -0000 Author: mat Date: Sun Nov 27 12:40:13 2016 New Revision: 49702 URL: https://svnweb.freebsd.org/changeset/doc/49702 Log: Always use "group" for the multiple location distribution file scheme. It conflict with the tagname from the GitHub section. Sponsored by: Absolight 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 Sat Nov 26 16:50:08 2016 (r49701) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Sun Nov 27 12:40:13 2016 (r49702) @@ -2099,8 +2099,8 @@ USE_GITHUB= yes GH_ACCOUNT, GH_PROJECT, and GH_TAGNAME. Each different value is - assigned a tag. The main value can either have no tag, or - the :DEFAULT tag. A value can be + assigned a group. The main value can either have no group, or + the :DEFAULT group. A value can be omitted if it is the same as the default as listed in . @@ -2110,11 +2110,11 @@ USE_GITHUB= yes project, tagname, and group information at the same place. - For each tag, a - ${WRKSRC_tag} + For each group, a + ${WRKSRC_group} helper variable is created, containing the directory into which the file has been extracted. The - ${WRKSRC_tag} + ${WRKSRC_group} variables can be used to move directories around during post-extract, or add to CONFIGURE_ARGS, or whatever is needed @@ -2123,7 +2123,7 @@ USE_GITHUB= yes As this is only syntastic sugar above DISTFILES and - MASTER_SITES, the tag names must adhere + MASTER_SITES, the group names must adhere to the restrictions on group names outlined in @@ -2135,7 +2135,7 @@ USE_GITHUB= yes From time to time, there is a need to fetch more than one distribution file. For example, when the upstream git repository uses submodules. This can be - done easily using tags in the + done easily using groups in the GH_* variables: @@ -2153,8 +2153,8 @@ CONFIGURE_ARGS= --with-contrib=${WRKSRC_ This will fetch three distribution files from github. The default one comes from foo/foo and is version - 1.0.2. The second one, tagged - icons, comes from + 1.0.2. The second one, with the + icons group, comes from bar/foo-icons and is in version 1.0. The third one comes from bar/foo-contrib and uses the @@ -2170,11 +2170,11 @@ CONFIGURE_ARGS= --with-contrib=${WRKSRC_ ${WRKSRC}, in this case, ${WRKDIR}/foo-1.0.2. Each additional distribution file is extracted in - ${WRKSRC_tag}. - Here, for the icons tag, it is called + ${WRKSRC_group}. + Here, for the icons group, it is called ${WRKSRC_icons} and it contains ${WRKDIR}/foo-icons-1.0. The file - with the contrib tag is called + with the contrib group is called ${WRKSRC_contrib} and contains ${WRKDIR}/foo-contrib-fa579bc. @@ -2530,9 +2530,9 @@ EXTRACT_ONLY= source.tar.gzTo support this, each entry in DISTFILES may be followed by a colon and - a tag name. Each site listed in + a group name. Each site listed in MASTER_SITES is then followed by a colon, - and the tag that indicates which distribution files are + and the group that indicates which distribution files are downloaded from this site. For example, consider an application with the source @@ -2554,7 +2554,7 @@ DISTFILES= source1.tar.gz:source1 \ source2.tar.gz:source2 - Multiple distribution files can have the same tag. + Multiple distribution files can have the same group. Continuing the previous example, suppose that there was a third distfile, source3.tar.gz, that is downloaded from