From owner-svn-src-head@freebsd.org Tue Mar 7 17:38:53 2017 Return-Path: Delivered-To: svn-src-head@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 56D13D01AE7; Tue, 7 Mar 2017 17:38:53 +0000 (UTC) (envelope-from ngie@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 2ECFB173A; Tue, 7 Mar 2017 17:38:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v27HcqSD070555; Tue, 7 Mar 2017 17:38:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27Hcq3Y070554; Tue, 7 Mar 2017 17:38:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703071738.v27Hcq3Y070554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 7 Mar 2017 17:38:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314869 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 17:38:53 -0000 Author: ngie Date: Tue Mar 7 17:38:52 2017 New Revision: 314869 URL: https://svnweb.freebsd.org/changeset/base/314869 Log: Alphabetically sort variables The only content change is minor rewording around CLEANDIRS/CLEANFILES to accomodate sorting order. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.README Modified: head/share/mk/bsd.README ============================================================================== --- head/share/mk/bsd.README Tue Mar 7 17:12:22 2017 (r314868) +++ head/share/mk/bsd.README Tue Mar 7 17:38:52 2017 (r314869) @@ -180,19 +180,19 @@ It has three targets: It sets/uses the following variables: +MAN The manual pages to be installed (use a .1 - .9 suffix). + MANDIR Base path for manual installation. MANGRP Manual group. -MANOWN Manual owner. - MANMODE Manual mode. +MANOWN Manual owner. + MANSUBDIR Subdirectory under the manual page section, i.e. "/vax" or "/tahoe" for machine specific manual pages. -MAN The manual pages to be installed (use a .1 - .9 suffix). - MLINKS List of manual page links (using a .1 - .9 suffix). The linked-to file must come first, the linked file second, and there may be multiple pairs. The files are hard-linked. @@ -211,18 +211,18 @@ It sets/uses the following variables: BINGRP Binary group. -BINOWN Binary owner. - BINMODE Binary mode. +BINOWN Binary owner. + MANDIR Base path for manual installation. MANGRP Manual group. -MANOWN Manual owner. - MANMODE Manual mode. +MANOWN Manual owner. + This file is generally useful when building your own Makefiles so that they use the same default owners etc. as the rest of the tree. @@ -257,23 +257,43 @@ It has seven targets: It sets/uses the following variables: -AFLAGS Flags to the assembler when assembling .s files. - ACFLAGS Flags to the compiler when preprocessing and assembling .S files. -BINGRP Binary group. +AFLAGS Flags to the assembler when assembling .s files. -BINOWN Binary owner. +BINGRP Binary group. BINMODE Binary mode. -CLEANFILES Additional files to remove and -CLEANDIRS additional directories to remove during clean and cleandir - targets. "rm -f" and "rm -rf" used respectively. +BINOWN Binary owner. CFLAGS Flags to the compiler when creating C objects. +CLEANDIRS Additional files (CLEANFILES) and directories (CLEANDIRS) to +CLEANFILES remove during clean and cleandir targets. "rm -rf" and + "rm -f" are used, respectively. + +DPADD Additional dependencies for the program. Usually used for + libraries. For example, to depend on the compatibility and + utility libraries use: + + DPADD=${LIBCOMPAT} ${LIBUTIL} + + There is a predefined identifier for each (non-profiled, + non-shared) library and object. Library file names are + transformed to identifiers by removing the extension and + converting to upper case. + + There are no special identifiers for profiled or shared + libraries or objects. The identifiers for the standard + libraries are used in DPADD. This works correctly iff all + the libraries are built at the same time. Unfortunately, + it causes unnecessary relinks to shared libraries when + only the static libraries have changed. Dependencies on + shared libraries should be only on the library version + numbers. + FILES A list of non-executable files. The installation is controlled by the FILESNAME, FILESOWN, FILESGRP, FILESMODE, FILESDIR variables that can be @@ -285,14 +305,14 @@ LDADD Additional loader objects. Usual LDADD=-lutil -lcompat -LIBADD Additional libraries. This is for base system libraries - and is only valid inside of the /usr/src tree. - Rather than use LDADD=-lname use LIBADD=name. - LDFLAGS Additional loader flags. Passed to the loader via CC, since that's used to link programs as well, so loader specific flags need to be prefixed with -Wl, to work. +LIBADD Additional libraries. This is for base system libraries + and is only valid inside of the /usr/src tree. + Rather than use LDADD=-lname use LIBADD=name. + LINKS The list of binary links; should be full pathnames, the linked-to file coming first, followed by the linked file. The files are hard-linked. For example, to link @@ -306,6 +326,9 @@ MAN Manual pages (should end in .1 - .9 PROG The name of the program to build. If not supplied, nothing is built. +PROGNAME The name that the above program will be installed as, if + different from ${PROG}. + PROG_CXX If defined, the name of the program to build. Also causes to link the program with the standard C++ library. PROG_CXX overrides the value @@ -344,33 +367,15 @@ PROGS_CXX PROG and PROGS_CXX in one Make - STRIP - WARNS -PROGNAME The name that the above program will be installed as, if - different from ${PROG}. +SCRIPTS A list of interpreter scripts [file.{sh,csh,pl,awk,...}]. + The installation is controlled by the SCRIPTSNAME, SCRIPTSOWN, + SCRIPTSGRP, SCRIPTSMODE, SCRIPTSDIR variables that can be + further specialized by SCRIPTS_