[pkgsrc/trunk]: pkgsrc/mk Merge down janitorial change from tv-derecurse branch:

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7fb6fb8a909
branches:  trunk
changeset: 488073:c7fb6fb8a909
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Jan 24 18:07:56 2005 +0000

description:
Merge down janitorial change from tv-derecurse branch:

Move definition of PKGSRC_COMPILER to defaults/mk.conf, to make it more
readily seen by the user.

diffstat:

 mk/compiler.mk      |  5 +----
 mk/defaults/mk.conf |  7 ++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r c28c2b935a39 -r c7fb6fb8a909 mk/compiler.mk
--- a/mk/compiler.mk    Mon Jan 24 18:06:57 2005 +0000
+++ b/mk/compiler.mk    Mon Jan 24 18:07:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.43 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: compiler.mk,v 1.44 2005/01/24 18:07:56 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -74,9 +74,6 @@
 USE_LANGUAGES:=        c ${USE_LANGUAGES}
 .endif
 
-# Default to using gcc.
-PKGSRC_COMPILER?=      gcc
-
 # For environments where there is an external gcc too, but pkgsrc
 # should use the pkgsrc one for consistency.
 #
diff -r c28c2b935a39 -r c7fb6fb8a909 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Mon Jan 24 18:06:57 2005 +0000
+++ b/mk/defaults/mk.conf       Mon Jan 24 18:07:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.23 2005/01/12 12:54:45 jmmv Exp $
+# $NetBSD: mk.conf,v 1.24 2005/01/24 18:07:56 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -107,6 +107,11 @@
 # Possible: YES, NO
 # Default: YES
 
+PKGSRC_COMPILER?=      gcc
+# Compiler type(s) to use for building packages
+# Possible: (see comments in mk/compiler.mk)
+# Default: "gcc"
+
 PKGSRC_MESSAGE_RECIPIENTS?=
 # login names of recipients of any MESSAGE files which will be mailed
 # Possible: any login names